diff --git a/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-amqp1-hybrid/post.yaml b/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-amqp1-hybrid/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-amqp1-hybrid/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-neutron-dsvm-src-oslo.messaging-amqp1-hybrid/run.yaml b/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-amqp1-hybrid/run.yaml
deleted file mode 100644
index be83132c..00000000
--- a/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-amqp1-hybrid/run.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-tempest-neutron-dsvm-src-oslo.messaging-amqp1-hybrid
- from old job gate-tempest-neutron-dsvm-src-oslo.messaging-amqp1-hybrid-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 DEVSTACK_GATE_TEMPEST=1
- export DEVSTACK_GATE_TEMPEST_FULL=1
- export DEVSTACK_GATE_NEUTRON=1
-
- export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG="enable_plugin devstack-plugin-amqp1 git://git.openstack.org/openstack/devstack-plugin-amqp1"
-
- export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging"
-
- if [ "amqp1" == "amqp1" ]; then
- # The AMQP 1.0 plugin supports a couple of different message bus configurations
- # 'hybrid' - use RabbitMQ for Notifications, qdrouterd for RPC
- # 'dual' - use qpidd for Notifications, qdrouterd for RPC
- # default: use qpidd for Notifications and for RPC
- case "hybrid" in
- hybrid)
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-hybrid"
- ;;
- dual)
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-dual"
- ;;
- esac
- 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/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-kafka-default/post.yaml b/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-kafka-default/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-kafka-default/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-neutron-dsvm-src-oslo.messaging-kafka-default/run.yaml b/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-kafka-default/run.yaml
deleted file mode 100644
index 907a4696..00000000
--- a/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-kafka-default/run.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-tempest-neutron-dsvm-src-oslo.messaging-kafka-default
- from old job gate-tempest-neutron-dsvm-src-oslo.messaging-kafka-default-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 DEVSTACK_GATE_TEMPEST=1
- export DEVSTACK_GATE_TEMPEST_FULL=1
- export DEVSTACK_GATE_NEUTRON=1
-
- export PROJECTS="openstack/devstack-plugin-kafka $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG="enable_plugin devstack-plugin-kafka git://git.openstack.org/openstack/devstack-plugin-kafka"
-
- export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging"
-
- if [ "kafka" == "amqp1" ]; then
- # The AMQP 1.0 plugin supports a couple of different message bus configurations
- # 'hybrid' - use RabbitMQ for Notifications, qdrouterd for RPC
- # 'dual' - use qpidd for Notifications, qdrouterd for RPC
- # default: use qpidd for Notifications and for RPC
- case "default" in
- hybrid)
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-hybrid"
- ;;
- dual)
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-dual"
- ;;
- esac
- 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/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-pika-default/post.yaml b/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-pika-default/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-pika-default/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-neutron-dsvm-src-oslo.messaging-pika-default/run.yaml b/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-pika-default/run.yaml
deleted file mode 100644
index 9897e5cc..00000000
--- a/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-pika-default/run.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-tempest-neutron-dsvm-src-oslo.messaging-pika-default
- from old job gate-tempest-neutron-dsvm-src-oslo.messaging-pika-default-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 DEVSTACK_GATE_TEMPEST=1
- export DEVSTACK_GATE_TEMPEST_FULL=1
- export DEVSTACK_GATE_NEUTRON=1
-
- export PROJECTS="openstack/devstack-plugin-pika $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG="enable_plugin devstack-plugin-pika git://git.openstack.org/openstack/devstack-plugin-pika"
-
- export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging"
-
- if [ "pika" == "amqp1" ]; then
- # The AMQP 1.0 plugin supports a couple of different message bus configurations
- # 'hybrid' - use RabbitMQ for Notifications, qdrouterd for RPC
- # 'dual' - use qpidd for Notifications, qdrouterd for RPC
- # default: use qpidd for Notifications and for RPC
- case "default" in
- hybrid)
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-hybrid"
- ;;
- dual)
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-dual"
- ;;
- esac
- 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/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-zmq-default/post.yaml b/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-zmq-default/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-zmq-default/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-neutron-dsvm-src-oslo.messaging-zmq-default/run.yaml b/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-zmq-default/run.yaml
deleted file mode 100644
index 0ecf8f23..00000000
--- a/playbooks/legacy/tempest-neutron-dsvm-src-oslo.messaging-zmq-default/run.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-tempest-neutron-dsvm-src-oslo.messaging-zmq-default
- from old job gate-tempest-neutron-dsvm-src-oslo.messaging-zmq-default-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 DEVSTACK_GATE_TEMPEST=1
- export DEVSTACK_GATE_TEMPEST_FULL=1
- export DEVSTACK_GATE_NEUTRON=1
-
- export PROJECTS="openstack/devstack-plugin-zmq $PROJECTS"
- export DEVSTACK_LOCAL_CONFIG="enable_plugin devstack-plugin-zmq git://git.openstack.org/openstack/devstack-plugin-zmq"
-
- export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging"
-
- if [ "zmq" == "amqp1" ]; then
- # The AMQP 1.0 plugin supports a couple of different message bus configurations
- # 'hybrid' - use RabbitMQ for Notifications, qdrouterd for RPC
- # 'dual' - use qpidd for Notifications, qdrouterd for RPC
- # default: use qpidd for Notifications and for RPC
- case "default" in
- hybrid)
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-hybrid"
- ;;
- dual)
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-dual"
- ;;
- esac
- 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 }}'