diff --git a/.zuul.yaml b/.zuul.yaml
index 0ced333a5..91482e9e4 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -41,20 +41,34 @@
 # Begin v3 native jobs
 # See https://docs.openstack.org/devstack/latest/
 
-# This is a job from which all the different backend jobs can inherit.
+
 - job:
-    name: oslo.messaging-devstack-base
+    name: oslo.messaging-devstack-tempest-full-base
+    description: |
+      Base for all devstack based tempest full testing jobs (with
+      neutron)
+    abstract: true
     parent: devstack-tempest
+    timeout: 10800
     required-projects:
       - openstack/oslo.messaging
     vars:
       tox_envlist: full
-      zuul_copy_output:
-        '{{ devstack_base_dir }}/logs/qdrouterd.log': 'logs'
+
 
 - job:
-    name: oslo.messaging-devstack-amqp1
-    parent: oslo.messaging-devstack-base
+    name: oslo.messaging-src-dsvm-full-rabbit
+    description: |
+      Run full tempest tests against rabbitmq
+    parent: oslo.messaging-devstack-tempest-full-base
+
+
+- job:
+    name: oslo.messaging-src-dsvm-full-amqp1-hybrid
+    description: |
+      Run the full tempest tests using the AMQP 1.0 driver for RPC and
+      RabbitMQ for Notifications.
+    parent: oslo.messaging-devstack-tempest-full-base
     required-projects:
       - openstack/devstack-plugin-amqp1
     vars:
@@ -62,64 +76,47 @@
         AMQP1_SERVICE: qpid-hybrid
       devstack_plugins:
         devstack-plugin-amqp1: git://git.openstack.org/openstack/devstack-plugin-amqp1
+      zuul_copy_output:
+        '{{ devstack_base_dir }}/logs/qdrouterd.log': 'logs'
+
+
+- job:
+    name: oslo.messaging-src-dsvm-full-amqp1-centos-7
+    description: |
+      Run the oslo.messaging-src-dsvm-full-amqp1-hybrid test on a
+      centos 7 node.
+    parent: oslo.messaging-src-dsvm-full-amqp1-hybrid
+    # nodeset: centos-7
+    nodeset: devstack-single-node-centos-7
+
+
+- job:
+    name: oslo.messaging-src-dsvm-full-kafka-hybrid
+    description: |
+      Run the full tempest tests using the AMQP 1.0 driver for RPC and
+      Apache Kafka for Notifications.
+    parent: oslo.messaging-devstack-tempest-full-base
+    required-projects:
+      - openstack/devstack-plugin-kafka
+    vars:
+      devstack_plugins:
+        devstack-plugin-kafka: git://git.openstack.org/openstack/devstack-plugin-kafka
+      zuul_copy_output:
+        '{{ devstack_base_dir }}/logs/qdrouterd.log': 'logs'
+
+
+- job:
+    name: oslo.messaging-src-dsvm-full-kafka-centos-7
+    description: |
+      Run the oslo.messaging-src-dsvm-full-kafka-hybrid test on a
+      centos 7 node.
+    parent: oslo.messaging-src-dsvm-full-kafka-hybrid
+    # nodeset: centos-7
+    nodeset: devstack-single-node-centos-7
+
 
 # End v3 native jobs
 
-- job:
-    name: oslo.messaging-src-dsvm-full-rabbit-default
-    parent: legacy-dsvm-base
-    run: playbooks/oslo.messaging-src-dsvm-full-rabbit-default/run.yaml
-    post-run: playbooks/oslo.messaging-src-dsvm-full-rabbit-default/post.yaml
-    timeout: 10800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/oslo.messaging
-
-- job:
-    name: oslo.messaging-src-dsvm-full-amqp1-dual-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/run.yaml
-    post-run: playbooks/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/post.yaml
-    timeout: 10800
-    nodeset: legacy-centos-7
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-amqp1
-      - openstack/oslo.messaging
-
-- job:
-    name: oslo.messaging-src-dsvm-full-amqp1-hybrid
-    parent: legacy-dsvm-base
-    run: playbooks/oslo.messaging-src-dsvm-full-amqp1-hybrid/run.yaml
-    post-run: playbooks/oslo.messaging-src-dsvm-full-amqp1-hybrid/post.yaml
-    timeout: 10800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-amqp1
-      - openstack/oslo.messaging
-
-- job:
-    name: oslo.messaging-src-dsvm-full-kafka-default
-    parent: legacy-dsvm-base
-    run: playbooks/oslo.messaging-src-dsvm-full-kafka-default/run.yaml
-    post-run: playbooks/oslo.messaging-src-dsvm-full-kafka-default/post.yaml
-    timeout: 10800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-kafka
-      - openstack/oslo.messaging
-
-- job:
-    name: oslo.messaging-src-dsvm-full-kafka-default-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/oslo.messaging-src-dsvm-full-kafka-default-centos-7/run.yaml
-    post-run: playbooks/oslo.messaging-src-dsvm-full-kafka-default-centos-7/post.yaml
-    timeout: 10800
-    nodeset: legacy-centos-7
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-kafka
-      - openstack/oslo.messaging
 
 - job:
     name: oslo.messaging-src-grenade-dsvm
@@ -150,6 +147,7 @@
       - ^setup.cfg$
     nodeset: legacy-ubuntu-xenial-2-node
 
+
 - job:
     name: oslo.messaging-telemetry-dsvm-integration-amqp1
     parent: legacy-dsvm-base
@@ -171,6 +169,7 @@
       - openstack/dib-utils
       - openstack/diskimage-builder
 
+
 - job:
     name: oslo.messaging-telemetry-dsvm-integration-kafka
     parent: legacy-dsvm-base
@@ -192,6 +191,7 @@
       - openstack/dib-utils
       - openstack/diskimage-builder
 
+
 - job:
     name: oslo.messaging-telemetry-dsvm-integration-rabbit
     parent: legacy-dsvm-base
@@ -212,72 +212,30 @@
       - openstack/dib-utils
       - openstack/diskimage-builder
 
-- job:
-    name: oslo.messaging-tempest-neutron-dsvm-src-rabbit-default
-    parent: legacy-dsvm-base
-    run: playbooks/oslo.messaging-tempest-neutron-dsvm-src-rabbit-default/run.yaml
-    post-run: playbooks/oslo.messaging-tempest-neutron-dsvm-src-rabbit-default/post.yaml
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/neutron
-      - openstack/oslo.messaging
-      - openstack/tempest
-
-- job:
-    name: oslo.messaging-tempest-neutron-dsvm-src-amqp1-hybrid
-    parent: legacy-dsvm-base
-    run: playbooks/oslo.messaging-tempest-neutron-dsvm-src-amqp1-hybrid/run.yaml
-    post-run: playbooks/oslo.messaging-tempest-neutron-dsvm-src-amqp1-hybrid/post.yaml
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-amqp1
-      - openstack/neutron
-      - openstack/oslo.messaging
-      - openstack/tempest
-
-- job:
-    name: oslo.messaging-tempest-neutron-dsvm-src-kafka-default
-    parent: legacy-dsvm-base
-    run: playbooks/oslo.messaging-tempest-neutron-dsvm-src-kafka-default/run.yaml
-    post-run: playbooks/oslo.messaging-tempest-neutron-dsvm-src-kafka-default/post.yaml
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-kafka
-      - openstack/neutron
-      - openstack/oslo.messaging
-      - openstack/tempest
-
 
 - project:
     check:
       jobs:
-        - oslo.messaging-devstack-amqp1:
-            voting: false
+        - oslo.messaging-tox-py27-func-rabbit
         - oslo.messaging-tox-py27-func-amqp1:
             voting: false
         - oslo.messaging-tox-py27-func-kafka:
             voting: false
-        - oslo.messaging-tox-py27-func-rabbit
+        - oslo.messaging-tox-py35-func-rabbit:
+            voting: false
         - oslo.messaging-tox-py35-func-amqp1:
             voting: false
         - oslo.messaging-tox-py35-func-kafka:
             voting: false
-        - oslo.messaging-tox-py35-func-rabbit:
-            voting: false
 
-        - oslo.messaging-src-dsvm-full-rabbit-default
+        - oslo.messaging-src-dsvm-full-rabbit
         - oslo.messaging-src-dsvm-full-amqp1-hybrid:
             voting: false
-            branches: ^(?!stable/ocata).*$
-        - oslo.messaging-src-dsvm-full-amqp1-dual-centos-7:
+        - oslo.messaging-src-dsvm-full-amqp1-centos-7:
             voting: false
-            branches: ^(?!stable/ocata).*$
-        - oslo.messaging-src-dsvm-full-kafka-default-centos-7:
+        - oslo.messaging-src-dsvm-full-kafka-hybrid:
             voting: false
-        - oslo.messaging-src-dsvm-full-kafka-default:
+        - oslo.messaging-src-dsvm-full-kafka-centos-7:
             voting: false
 
         - oslo.messaging-src-grenade-dsvm:
@@ -291,22 +249,11 @@
         - oslo.messaging-telemetry-dsvm-integration-kafka:
             voting: false
 
-        - oslo.messaging-tempest-neutron-dsvm-src-rabbit-default
-        - oslo.messaging-tempest-neutron-dsvm-src-amqp1-hybrid:
-            voting: false
-            branches: ^(?!stable/ocata).*$
-        - oslo.messaging-tempest-neutron-dsvm-src-kafka-default:
-            voting: false
-
         - openstack-tox-lower-constraints
+
     gate:
       jobs:
         - oslo.messaging-tox-py27-func-rabbit
+        - oslo.messaging-src-dsvm-full-rabbit
         - oslo.messaging-telemetry-dsvm-integration-rabbit
-        - oslo.messaging-src-dsvm-full-rabbit-default
-        - oslo.messaging-tempest-neutron-dsvm-src-rabbit-default
-
-
-
-
         - openstack-tox-lower-constraints
diff --git a/playbooks/oslo.messaging-devstack-full/post.yaml b/playbooks/oslo.messaging-devstack-full/post.yaml
deleted file mode 100644
index 39e641b1a..000000000
--- a/playbooks/oslo.messaging-devstack-full/post.yaml
+++ /dev/null
@@ -1,16 +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/oslo.messaging-devstack-full/pre.yaml b/playbooks/oslo.messaging-devstack-full/pre.yaml
deleted file mode 100644
index c30fa38d9..000000000
--- a/playbooks/oslo.messaging-devstack-full/pre.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- hosts: all
-  name: Test the pre run
-  tasks:
-
-    - shell:
-        cmd: |
-          set -x
-          echo "test pre phase"
-          export -p
-          ls -l
-          pwd
-        executable: /bin/bash
diff --git a/playbooks/oslo.messaging-devstack-full/run.yaml b/playbooks/oslo.messaging-devstack-full/run.yaml
deleted file mode 100644
index 97cfe70c2..000000000
--- a/playbooks/oslo.messaging-devstack-full/run.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-- hosts: all
-  name: testing the devstack-tempest job for oslo.messaging
-
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -x
-          echo "test run phase"
-          export -p
-          ls -l
-          pwd
-        executable: /bin/bash
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - 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 PROJECTS="openstack/oslo.messaging $PROJECTS"
-          if [ -n "{{ transport_plugin_project }}" ]; then
-              export PROJECTS="{{ transport_plugin_project }} $PROJECTS"
-          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/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/post.yaml b/playbooks/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/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/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/run.yaml b/playbooks/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/run.yaml
deleted file mode 100644
index f3e2a6103..000000000
--- a/playbooks/oslo.messaging-src-dsvm-full-amqp1-dual-centos-7/run.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-oslo.messaging-src-dsvm-full-amqp1-dual-centos-7
-    from old job gate-oslo.messaging-src-dsvm-full-amqp1-dual-centos-7-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 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"
-
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-dual"
-
-          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/oslo.messaging-src-dsvm-full-amqp1-hybrid/post.yaml b/playbooks/oslo.messaging-src-dsvm-full-amqp1-hybrid/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/oslo.messaging-src-dsvm-full-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/oslo.messaging-src-dsvm-full-amqp1-hybrid/run.yaml b/playbooks/oslo.messaging-src-dsvm-full-amqp1-hybrid/run.yaml
deleted file mode 100644
index a3f94fdf9..000000000
--- a/playbooks/oslo.messaging-src-dsvm-full-amqp1-hybrid/run.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-oslo.messaging-src-dsvm-full-amqp1-hybrid from old
-    job gate-oslo.messaging-src-dsvm-full-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 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"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-hybrid"
-
-          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/oslo.messaging-src-dsvm-full-kafka-default-centos-7/post.yaml b/playbooks/oslo.messaging-src-dsvm-full-kafka-default-centos-7/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/oslo.messaging-src-dsvm-full-kafka-default-centos-7/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/oslo.messaging-src-dsvm-full-kafka-default-centos-7/run.yaml b/playbooks/oslo.messaging-src-dsvm-full-kafka-default-centos-7/run.yaml
deleted file mode 100644
index 628fef5c9..000000000
--- a/playbooks/oslo.messaging-src-dsvm-full-kafka-default-centos-7/run.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-oslo.messaging-src-dsvm-full-kafka-default-centos-7
-    from old job gate-oslo.messaging-src-dsvm-full-kafka-default-centos-7-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 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"
-
-          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/oslo.messaging-src-dsvm-full-kafka-default/post.yaml b/playbooks/oslo.messaging-src-dsvm-full-kafka-default/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/oslo.messaging-src-dsvm-full-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/oslo.messaging-src-dsvm-full-kafka-default/run.yaml b/playbooks/oslo.messaging-src-dsvm-full-kafka-default/run.yaml
deleted file mode 100644
index e2cdcadb1..000000000
--- a/playbooks/oslo.messaging-src-dsvm-full-kafka-default/run.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-oslo.messaging-src-dsvm-full-kafka-default from old
-    job gate-oslo.messaging-src-dsvm-full-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 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"
-
-          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/oslo.messaging-src-dsvm-full-rabbit-default/post.yaml b/playbooks/oslo.messaging-src-dsvm-full-rabbit-default/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/oslo.messaging-src-dsvm-full-rabbit-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/oslo.messaging-src-dsvm-full-rabbit-default/run.yaml b/playbooks/oslo.messaging-src-dsvm-full-rabbit-default/run.yaml
deleted file mode 100644
index 45e0ee17e..000000000
--- a/playbooks/oslo.messaging-src-dsvm-full-rabbit-default/run.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-- hosts: all
-  name: Full tempest tests with rabbitmq
-  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_PROJECT_FROM_GIT="oslo.messaging"
-
-          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/oslo.messaging-src-dsvm-full-zmq-default/post.yaml b/playbooks/oslo.messaging-src-dsvm-full-zmq-default/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/oslo.messaging-src-dsvm-full-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/oslo.messaging-src-dsvm-full-zmq-default/run.yaml b/playbooks/oslo.messaging-src-dsvm-full-zmq-default/run.yaml
deleted file mode 100644
index f8ee48e95..000000000
--- a/playbooks/oslo.messaging-src-dsvm-full-zmq-default/run.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-oslo.messaging-src-dsvm-full-zmq-default from old
-    job gate-oslo.messaging-src-dsvm-full-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 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"
-
-          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/oslo.messaging-tempest-neutron-dsvm-src-amqp1-hybrid/post.yaml b/playbooks/oslo.messaging-tempest-neutron-dsvm-src-amqp1-hybrid/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/oslo.messaging-tempest-neutron-dsvm-src-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/oslo.messaging-tempest-neutron-dsvm-src-amqp1-hybrid/run.yaml b/playbooks/oslo.messaging-tempest-neutron-dsvm-src-amqp1-hybrid/run.yaml
deleted file mode 100644
index 4d662a812..000000000
--- a/playbooks/oslo.messaging-tempest-neutron-dsvm-src-amqp1-hybrid/run.yaml
+++ /dev/null
@@ -1,46 +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"
-          export DEVSTACK_LOCAL_CONFIG+=$'\n'"AMQP1_SERVICE=qpid-hybrid"
-
-          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/oslo.messaging-tempest-neutron-dsvm-src-kafka-default/post.yaml b/playbooks/oslo.messaging-tempest-neutron-dsvm-src-kafka-default/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/oslo.messaging-tempest-neutron-dsvm-src-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/oslo.messaging-tempest-neutron-dsvm-src-kafka-default/run.yaml b/playbooks/oslo.messaging-tempest-neutron-dsvm-src-kafka-default/run.yaml
deleted file mode 100644
index a9b494322..000000000
--- a/playbooks/oslo.messaging-tempest-neutron-dsvm-src-kafka-default/run.yaml
+++ /dev/null
@@ -1,45 +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"
-
-          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/oslo.messaging-tempest-neutron-dsvm-src-rabbit-default/post.yaml b/playbooks/oslo.messaging-tempest-neutron-dsvm-src-rabbit-default/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/oslo.messaging-tempest-neutron-dsvm-src-rabbit-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/oslo.messaging-tempest-neutron-dsvm-src-rabbit-default/run.yaml b/playbooks/oslo.messaging-tempest-neutron-dsvm-src-rabbit-default/run.yaml
deleted file mode 100644
index 6de63cccb..000000000
--- a/playbooks/oslo.messaging-tempest-neutron-dsvm-src-rabbit-default/run.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-- hosts: all
-  name: Tempest full with neutron using rabbitmq
-  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 DEVSTACK_PROJECT_FROM_GIT="oslo.messaging"
-
-          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/oslo.messaging-tempest-neutron-dsvm-src-zmq-default/post.yaml b/playbooks/oslo.messaging-tempest-neutron-dsvm-src-zmq-default/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/oslo.messaging-tempest-neutron-dsvm-src-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/oslo.messaging-tempest-neutron-dsvm-src-zmq-default/run.yaml b/playbooks/oslo.messaging-tempest-neutron-dsvm-src-zmq-default/run.yaml
deleted file mode 100644
index cbb6d0044..000000000
--- a/playbooks/oslo.messaging-tempest-neutron-dsvm-src-zmq-default/run.yaml
+++ /dev/null
@@ -1,45 +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"
-
-          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 }}'