From 8f3db9a7f56fa0990fe352119d6ac1838db5e327 Mon Sep 17 00:00:00 2001
From: Sean McGinnis <sean.mcginnis@huawei.com>
Date: Thu, 22 Mar 2018 13:20:01 -0500
Subject: [PATCH] Remove legacy-brick-cinderclient-ext-dsvm-functional

This job has now been converted over to an updated in-repo test
and can be removed.

Change-Id: I22db2c313bf1e9a685e8ace2d98fb1adc81da84c
---
 .../post.yaml                                 | 80 -------------------
 .../run.yaml                                  | 48 -----------
 zuul.d/zuul-legacy-jobs.yaml                  | 11 ---
 3 files changed, 139 deletions(-)
 delete mode 100644 playbooks/legacy/brick-cinderclient-ext-dsvm-functional/post.yaml
 delete mode 100644 playbooks/legacy/brick-cinderclient-ext-dsvm-functional/run.yaml

diff --git a/playbooks/legacy/brick-cinderclient-ext-dsvm-functional/post.yaml b/playbooks/legacy/brick-cinderclient-ext-dsvm-functional/post.yaml
deleted file mode 100644
index dac87534..00000000
--- a/playbooks/legacy/brick-cinderclient-ext-dsvm-functional/post.yaml
+++ /dev/null
@@ -1,80 +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=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=/.testrepository/tmp*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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/brick-cinderclient-ext-dsvm-functional/run.yaml b/playbooks/legacy/brick-cinderclient-ext-dsvm-functional/run.yaml
deleted file mode 100644
index 01a63c13..00000000
--- a/playbooks/legacy/brick-cinderclient-ext-dsvm-functional/run.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-brick-cinderclient-ext-dsvm-functional from old job
-    gate-brick-cinderclient-ext-dsvm-functional-ubuntu-xenial
-  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 BRANCH_OVERRIDE=default
-          export DEVSTACK_PROJECT_FROM_GIT=python-brick-cinderclient-ext
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          function post_test_hook {
-              # Configure and run functional tests
-              $BASE/new/python-brick-cinderclient-ext/brick_cinderclient_ext/tests/functional/hooks/post_test_hook.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 3411a56f..7c909610 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -72,17 +72,6 @@
     post-run: playbooks/legacy/beaker-nodepool-rake/post.yaml
     timeout: 1800
 
-- job:
-    name: legacy-brick-cinderclient-ext-dsvm-functional
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/brick-cinderclient-ext-dsvm-functional/run.yaml
-    post-run: playbooks/legacy/brick-cinderclient-ext-dsvm-functional/post.yaml
-    timeout: 3900
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/cinder
-      - openstack/python-brick-cinderclient-ext
-
 - job:
     name: legacy-cloudkitty-dsvm-install
     parent: legacy-dsvm-base