From 8a796bba15916a37599b954cd135310f8efed8ba Mon Sep 17 00:00:00 2001
From: Kenneth Giusti <kgiusti@gmail.com>
Date: Thu, 16 Jul 2020 15:04:51 -0400
Subject: [PATCH] Update the Zuul configuration

 - Remove deprecated test that is no longer used by oslo.messaging
 - Gate remaining tests to prevent breakage of dependent
 oslo.messaging project

Change-Id: I7a48bf58733fe20c6694655abf657bf517cc9de5
---
 .zuul.yaml                                    | 24 +----------
 .../post.yaml                                 | 15 -------
 .../run.yaml                                  | 41 -------------------
 3 files changed, 2 insertions(+), 78 deletions(-)
 delete mode 100644 playbooks/devstack-plugin-amqp1-tempest-dsvm-full/post.yaml
 delete mode 100644 playbooks/devstack-plugin-amqp1-tempest-dsvm-full/run.yaml

diff --git a/.zuul.yaml b/.zuul.yaml
index d28490f..2c051e9 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,29 +1,9 @@
-- job:
-    # TODO(kgiusti) this old test can be removed once ocata is no
-    # longer supported At that point we only need the -hybrid and
-    # -dual test cases
-    name: devstack-plugin-amqp1-tempest-dsvm-full
-    parent: legacy-dsvm-base
-    run: playbooks/devstack-plugin-amqp1-tempest-dsvm-full/run.yaml
-    post-run: playbooks/devstack-plugin-amqp1-tempest-dsvm-full/post.yaml
-    timeout: 10800
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/devstack-plugin-amqp1
-      - openstack/tempest
-
 - project:
     check:
       jobs:
-        - devstack-plugin-amqp1-tempest-dsvm-full:
-            voting: false
-        - oslo.messaging-src-dsvm-full-amqp1-hybrid:
-            voting: false
-            branches: ^(?!stable/ocata).*$
-        - oslo.messaging-src-dsvm-full-amqp1-dual-centos-7:
-            voting: false
-            branches: ^(?!stable/ocata).*$
         - openstack-tox-bashate
+        - oslo.messaging-src-dsvm-full-amqp1-hybrid
     gate:
       jobs:
         - openstack-tox-bashate
+        - oslo.messaging-src-dsvm-full-amqp1-hybrid
diff --git a/playbooks/devstack-plugin-amqp1-tempest-dsvm-full/post.yaml b/playbooks/devstack-plugin-amqp1-tempest-dsvm-full/post.yaml
deleted file mode 100644
index e07f551..0000000
--- a/playbooks/devstack-plugin-amqp1-tempest-dsvm-full/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/devstack-plugin-amqp1-tempest-dsvm-full/run.yaml b/playbooks/devstack-plugin-amqp1-tempest-dsvm-full/run.yaml
deleted file mode 100644
index 875f3a8..0000000
--- a/playbooks/devstack-plugin-amqp1-tempest-dsvm-full/run.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-tempest-dsvm-full-amqp1 from old job gate-tempest-dsvm-full-amqp1-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/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/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_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_FULL=1
-
-          export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS"
-          export DEVSTACK_LOCAL_CONFIG="enable_plugin devstack-plugin-amqp1 https://opendev.org/openstack/devstack-plugin-amqp1"
-
-          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 }}'