From 6124b103d3b9f10fcc82d2ba3ad5d5be51a71745 Mon Sep 17 00:00:00 2001
From: Duong Ha-Quang <duonghq@vn.fujitsu.com>
Date: Fri, 13 Oct 2017 15:28:45 +0700
Subject: [PATCH] Remove legacy jobs in Mixmatch

Depends-On: I6d97b4ec8f4c22785a1081dc711257c071637999
Depends-On: I1970b4261ab11356adb2308890842bdf115b3f1e

Change-Id: I07fe4c4430c4597ed71761c34b4f82d8c663fa5b
---
 .../legacy/mixmatch-dsvm-functional/post.yaml | 15 ------
 .../legacy/mixmatch-dsvm-functional/run.yaml  | 52 -------------------
 zuul.d/zuul-legacy-jobs.yaml                  | 10 ----
 3 files changed, 77 deletions(-)
 delete mode 100644 playbooks/legacy/mixmatch-dsvm-functional/post.yaml
 delete mode 100644 playbooks/legacy/mixmatch-dsvm-functional/run.yaml

diff --git a/playbooks/legacy/mixmatch-dsvm-functional/post.yaml b/playbooks/legacy/mixmatch-dsvm-functional/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/mixmatch-dsvm-functional/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/mixmatch-dsvm-functional/run.yaml b/playbooks/legacy/mixmatch-dsvm-functional/run.yaml
deleted file mode 100644
index 0a4c07db..00000000
--- a/playbooks/legacy/mixmatch-dsvm-functional/run.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-mixmatch-dsvm-functional from old job gate-mixmatch-dsvm-functional-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 BRANCH_OVERRIDE=default
-          export PROJECTS="openstack/mixmatch $PROJECTS"
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin mixmatch git://git.openstack.org/openstack/mixmatch"
-
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-
-          function post_test_hook {
-              # Configure and run functional tests
-              $BASE/new/mixmatch/mixmatch/tests/functional/hooks/dsvm_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 e05fd705..2817376f 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -4794,16 +4794,6 @@
     post-run: playbooks/legacy/merlin-js-release-master/post
     timeout: 1800
 
-- job:
-    name: legacy-mixmatch-dsvm-functional
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/mixmatch-dsvm-functional/run
-    post-run: playbooks/legacy/mixmatch-dsvm-functional/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/mixmatch
-
 - job:
     name: legacy-mogan-dsvm-tempest-plugin
     parent: legacy-dsvm-base