From 57ac92f2705c4f6f47aad4450d427f4918a59bfa Mon Sep 17 00:00:00 2001
From: Brian Rosmaita <rosmaita.fossdev@gmail.com>
Date: Sun, 10 Dec 2017 14:58:31 -0500
Subject: [PATCH] Remove glance legacy job

Depends-On: Ie92d37964211aca8d6d634204f564059a7f01e13
Depends-On: I38edaa298669b4eb7554a4b2f4856a28d5352cc8
Change-Id: Ib2dff1219859f183b2c55572931174164b9823ee
---
 .../glance-dsvm-grenade-multinode/post.yaml   | 15 -------
 .../glance-dsvm-grenade-multinode/run.yaml    | 45 -------------------
 zuul.d/zuul-legacy-jobs.yaml                  | 12 -----
 3 files changed, 72 deletions(-)
 delete mode 100644 playbooks/legacy/glance-dsvm-grenade-multinode/post.yaml
 delete mode 100644 playbooks/legacy/glance-dsvm-grenade-multinode/run.yaml

diff --git a/playbooks/legacy/glance-dsvm-grenade-multinode/post.yaml b/playbooks/legacy/glance-dsvm-grenade-multinode/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/glance-dsvm-grenade-multinode/post.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-- hosts: primary
-  tasks:
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/logs/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/glance-dsvm-grenade-multinode/run.yaml b/playbooks/legacy/glance-dsvm-grenade-multinode/run.yaml
deleted file mode 100644
index c66a1767..00000000
--- a/playbooks/legacy/glance-dsvm-grenade-multinode/run.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-glance-dsvm-grenade-multinode from old job gate-glance-dsvm-grenade-multinode-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_CONFIGDRIVE=0
-          export DEVSTACK_GATE_GRENADE=pullup
-          export PROJECTS="openstack-dev/grenade $PROJECTS"
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export DEVSTACK_GATE_TOPOLOGY="multinode"
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml
index cd120a92..3db62df0 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -279,18 +279,6 @@
     timeout: 1800
     nodeset: legacy-ubuntu-trusty
 
-- job:
-    name: legacy-glance-dsvm-grenade-multinode
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/glance-dsvm-grenade-multinode/run.yaml
-    post-run: playbooks/legacy/glance-dsvm-grenade-multinode/post.yaml
-    timeout: 10800
-    required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
-      - openstack/glance
-    nodeset: legacy-ubuntu-xenial-2-node
-
 - job:
     name: legacy-glare-dsvm
     parent: legacy-dsvm-base