From 57b04e50271c351d352fdc4be23bb8b60c51e0c0 Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Sun, 5 Aug 2018 11:58:49 -0400
Subject: [PATCH] move legacy-tempest-dsvm-full-zmq to
 openstack/devstack-plugin-zmq

openstack/devstack-plugin-zmq is the only user of the job, so move the
definition there.

Story: #2003250
Change-Id: I3bc401038790ac539789c2f4d704a98f4ee76cfd
Depends-On: I3d80c8a576fa4cbedffdaaf6cf97a4a61a2dce34
Depends-On: I3476584f37402431787aabbce1d0c7bf37cebeee
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
---
 .../legacy/tempest-dsvm-full-zmq/post.yaml    | 15 -----
 .../legacy/tempest-dsvm-full-zmq/run.yaml     | 61 -------------------
 zuul.d/zuul-legacy-jobs.yaml                  | 11 ----
 3 files changed, 87 deletions(-)
 delete mode 100644 playbooks/legacy/tempest-dsvm-full-zmq/post.yaml
 delete mode 100644 playbooks/legacy/tempest-dsvm-full-zmq/run.yaml

diff --git a/playbooks/legacy/tempest-dsvm-full-zmq/post.yaml b/playbooks/legacy/tempest-dsvm-full-zmq/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/tempest-dsvm-full-zmq/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/tempest-dsvm-full-zmq/run.yaml b/playbooks/legacy/tempest-dsvm-full-zmq/run.yaml
deleted file mode 100644
index fa29ce68..00000000
--- a/playbooks/legacy/tempest-dsvm-full-zmq/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-tempest-dsvm-full-zmq from old job gate-tempest-dsvm-full-zmq-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]]
-          enable_plugin devstack-plugin-zmq git://git.openstack.org/openstack/devstack-plugin-zmq
-
-          EOF
-        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_TEMPEST=1
-          export PROJECTS="openstack/devstack-plugin-zmq $PROJECTS"
-
-          if [[ "zmq" = "sheepdog" ]]; then
-              export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1
-              # As we are setting DEVSTACK_GATE_TEMPEST_ALL_PLUGINS, we need
-              # to add the regex to limit the tests to the same as a tempest
-              # -efull would run.
-              export DEVSTACK_GATE_TEMPEST_REGEX='(?!.*\[.*\bslow\b.*\])(^tempest\.(api|scenario)|(^cinder\.tests.tempest))'
-          else
-              export DEVSTACK_GATE_TEMPEST_FULL=1
-          fi
-
-          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 48b4c513..6e61472d 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -2182,17 +2182,6 @@
       - openstack-infra/devstack-gate
       - openstack/tempest
 
-- job:
-    name: legacy-tempest-dsvm-full-zmq
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-full-zmq/run.yaml
-    post-run: playbooks/legacy/tempest-dsvm-full-zmq/post.yaml
-    timeout: 10800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-zmq
-      - openstack/tempest
-
 - job:
     name: legacy-tempest-dsvm-identity-v3-test-accounts
     parent: legacy-dsvm-base