From 3d30d3fac99beb3b13a9625cbbb7d1e83d580b0f Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 5 Feb 2018 14:59:10 +1100
Subject: [PATCH] Remove legacy-devstack-dsvm-py35-updown

With the dependent change this job has been removed from devstack and
thus isn't required any more.

Change-Id: Ic6cc15f99111769ee71836f35136604d2b0764d8
Depends-On: https://review.openstack.org/540707
---
 .../devstack-dsvm-py35-updown/post.yaml       | 15 ----
 .../legacy/devstack-dsvm-py35-updown/run.yaml | 69 -------------------
 zuul.d/zuul-legacy-jobs.yaml                  | 17 -----
 3 files changed, 101 deletions(-)
 delete mode 100644 playbooks/legacy/devstack-dsvm-py35-updown/post.yaml
 delete mode 100644 playbooks/legacy/devstack-dsvm-py35-updown/run.yaml

diff --git a/playbooks/legacy/devstack-dsvm-py35-updown/post.yaml b/playbooks/legacy/devstack-dsvm-py35-updown/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/devstack-dsvm-py35-updown/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/devstack-dsvm-py35-updown/run.yaml b/playbooks/legacy/devstack-dsvm-py35-updown/run.yaml
deleted file mode 100644
index f95d6214..00000000
--- a/playbooks/legacy/devstack-dsvm-py35-updown/run.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-devstack-dsvm-py35-updown from old job gate-devstack-dsvm-py35-updown-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
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          # swift is not ready for python3 yet
-          disable_service s-account
-          disable_service s-container
-          disable_service s-object
-          disable_service s-proxy
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export DEVSTACK_GATE_USE_PYTHON3=True
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_HEAT=1
-          export DEVSTACK_GATE_SAHARA=1
-          export DEVSTACK_GATE_TLSPROXY=1
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          # ensure that the unstack.sh and clean.sh scripts run
-          # without errors, so that we can
-          function post_test_hook {
-              cd /opt/stack/new/devstack
-              ./gate/updown.sh
-          }
-          export -f post_test_hook
-
-          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 4fd90a57..59911f5a 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -169,23 +169,6 @@
       - openstack/murano-dashboard
       - openstack/python-muranoclient
 
-- job:
-    name: legacy-devstack-dsvm-py35-updown
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/devstack-dsvm-py35-updown/run.yaml
-    post-run: playbooks/legacy/devstack-dsvm-py35-updown/post.yaml
-    timeout: 4200
-    required-projects:
-      - openstack-dev/devstack
-      - openstack-infra/devstack-gate
-      # following are required when DEVSTACK_GATE_HEAT, which this
-      # job turns on
-      - openstack/dib-utils
-      - openstack/diskimage-builder
-      # Required by DEVSTACK_GATE_SAHARA
-      - openstack/sahara
-      - openstack/sahara-dashboard
-
 - job:
     name: legacy-devstack-dsvm-py36-updown-fedora-26
     parent: legacy-dsvm-base