Migrate to Zuul v3 native job definitions

This patch migrates the legacy gate jobs to Zuul v3 native ones(a new
trove-devstack role is created for all those legecy jobs, and the
previous way of running gate jobs is still kept as we still cannot
migrate the genade job to a Zuul v3 native one), following the
documents below:
https://docs.openstack.org/infra/manual/zuulv3.html
https://docs.openstack.org/devstack/latest/zuul_ci_jobs_migration.html

Change-Id: I10a1adae3a79b7322118fce180119f0ee5ff2e1b
Signed-off-by: Zhao Chao <zhaochao1984@gmail.com>

39 files changed, 4 insertions, 1659 deletions

diff --git a/playbooks/legacy/trove-functional-dsvm-mysql/post.yaml b/playbooks/legacy/trove-functional-dsvm-mysql/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-functional-dsvm-mysql/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/trove-functional-dsvm-mysql/run.yaml b/playbooks/legacy/trove-functional-dsvm-mysql/run.yaml
deleted file mode 100644
index 17dbbcd7..00000000
--- a/playbooks/legacy/trove-functional-dsvm-mysql/run.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-legacy-functional-dsvm-mysql from old job gate-trove-legacy-functional-dsvm-mysql
-  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 trove git://git.openstack.org/openstack/trove
-          TROVE_RESIZE_TIME_OUT=1800
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              export TROVE_RESIZE_TIME_OUT=1800
-              ./trovestack dsvm-gate-tests mysql
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-cassandra-multi/post.yaml b/playbooks/legacy/trove-scenario-dsvm-cassandra-multi/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-cassandra-multi/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/trove-scenario-dsvm-cassandra-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-cassandra-multi/run.yaml
deleted file mode 100644
index 5de48736..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-cassandra-multi/run.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-cassandra-multi from old job
-    gate-trove-scenario-dsvm-cassandra-multi-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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests cassandra cassandra-supported-multi
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-cassandra-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-cassandra-single/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-cassandra-single/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/trove-scenario-dsvm-cassandra-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-cassandra-single/run.yaml
deleted file mode 100644
index 543eea98..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-cassandra-single/run.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-cassandra-single from old job
-    gate-trove-scenario-dsvm-cassandra-single-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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests cassandra cassandra-supported-single
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-couchbase-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-couchbase-single/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-couchbase-single/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/trove-scenario-dsvm-couchbase-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-couchbase-single/run.yaml
deleted file mode 100644
index 11e23019..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-couchbase-single/run.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-couchbase-single from old job
-    gate-trove-scenario-dsvm-couchbase-single-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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests couchbase couchbase-supported-single
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-couchdb-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-couchdb-single/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-couchdb-single/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/trove-scenario-dsvm-couchdb-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-couchdb-single/run.yaml
deleted file mode 100644
index b54be3b7..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-couchdb-single/run.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-couchdb-single from old job gate-trove-scenario-dsvm-couchdb-single-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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests couchdb couchdb-supported-single
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-mariadb-multi/post.yaml b/playbooks/legacy/trove-scenario-dsvm-mariadb-multi/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-mariadb-multi/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/trove-scenario-dsvm-mariadb-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mariadb-multi/run.yaml
deleted file mode 100644
index d29f55d4..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-mariadb-multi/run.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-mariadb-multi from old job gate-trove-scenario-dsvm-mariadb-multi-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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests mariadb mariadb-supported-multi
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-mariadb-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-mariadb-single/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-mariadb-single/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/trove-scenario-dsvm-mariadb-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mariadb-single/run.yaml
deleted file mode 100644
index dc9202ae..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-mariadb-single/run.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-mariadb-single from old job gate-trove-scenario-dsvm-mariadb-single-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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests mariadb mariadb-supported-single
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-mongodb-multi/post.yaml b/playbooks/legacy/trove-scenario-dsvm-mongodb-multi/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-mongodb-multi/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/trove-scenario-dsvm-mongodb-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mongodb-multi/run.yaml
deleted file mode 100644
index f5e99187..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-mongodb-multi/run.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-mongodb-multi from old job gate-trove-scenario-dsvm-mongodb-multi-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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests mongodb mongodb-supported-multi
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-mongodb-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-mongodb-single/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-mongodb-single/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/trove-scenario-dsvm-mongodb-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mongodb-single/run.yaml
deleted file mode 100644
index b3cbc855..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-mongodb-single/run.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-mongodb-single from old job gate-trove-scenario-dsvm-mongodb-single-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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests mongodb mongodb-supported-single
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-mysql-multi/post.yaml b/playbooks/legacy/trove-scenario-dsvm-mysql-multi/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-mysql-multi/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/trove-scenario-dsvm-mysql-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mysql-multi/run.yaml
deleted file mode 100644
index e8812ecf..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-mysql-multi/run.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-mysql-multi from old job gate-trove-scenario-dsvm-mysql-multi-ubuntu-xenial
-  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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests mysql mysql-supported-multi
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-mysql-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-mysql-single/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-mysql-single/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/trove-scenario-dsvm-mysql-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mysql-single/run.yaml
deleted file mode 100644
index 0ce0bcbb..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-mysql-single/run.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-mysql-single from old job gate-trove-scenario-dsvm-mysql-single-ubuntu-xenial
-  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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests mysql mysql-supported-single
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-percona-multi/post.yaml b/playbooks/legacy/trove-scenario-dsvm-percona-multi/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-percona-multi/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/trove-scenario-dsvm-percona-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-percona-multi/run.yaml
deleted file mode 100644
index 88166225..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-percona-multi/run.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-percona-multi from old job gate-trove-scenario-dsvm-percona-multi-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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests percona percona-supported-multi
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-percona-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-percona-single/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-percona-single/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/trove-scenario-dsvm-percona-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-percona-single/run.yaml
deleted file mode 100644
index 97909b92..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-percona-single/run.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-percona-single from old job gate-trove-scenario-dsvm-percona-single-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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests percona percona-supported-single
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-postgresql-multi/post.yaml b/playbooks/legacy/trove-scenario-dsvm-postgresql-multi/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-postgresql-multi/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/trove-scenario-dsvm-postgresql-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-postgresql-multi/run.yaml
deleted file mode 100644
index 89de7a0d..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-postgresql-multi/run.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-postgresql-multi from old job
-    gate-trove-scenario-dsvm-postgresql-multi-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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests postgresql postgresql-supported-multi
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-postgresql-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-postgresql-single/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-postgresql-single/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/trove-scenario-dsvm-postgresql-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-postgresql-single/run.yaml
deleted file mode 100644
index 4ed4bb7e..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-postgresql-single/run.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-postgresql-single from old job
-    gate-trove-scenario-dsvm-postgresql-single-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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests postgresql postgresql-supported-single
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-pxc-multi/post.yaml b/playbooks/legacy/trove-scenario-dsvm-pxc-multi/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-pxc-multi/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/trove-scenario-dsvm-pxc-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-pxc-multi/run.yaml
deleted file mode 100644
index 6845861d..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-pxc-multi/run.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-pxc-multi from old job gate-trove-scenario-dsvm-pxc-multi-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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests pxc pxc-supported-multi
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-pxc-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-pxc-single/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-pxc-single/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/trove-scenario-dsvm-pxc-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-pxc-single/run.yaml
deleted file mode 100644
index ad4e229d..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-pxc-single/run.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-pxc-single from old job gate-trove-scenario-dsvm-pxc-single-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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests pxc pxc-supported-single
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-redis-multi/post.yaml b/playbooks/legacy/trove-scenario-dsvm-redis-multi/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-redis-multi/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/trove-scenario-dsvm-redis-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-redis-multi/run.yaml
deleted file mode 100644
index 1a125bc7..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-redis-multi/run.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-redis-multi from old job gate-trove-scenario-dsvm-redis-multi-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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests redis redis-supported-multi
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-scenario-dsvm-redis-single/post.yaml b/playbooks/legacy/trove-scenario-dsvm-redis-single/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-redis-single/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/trove-scenario-dsvm-redis-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-redis-single/run.yaml
deleted file mode 100644
index ae4d955e..00000000
--- a/playbooks/legacy/trove-scenario-dsvm-redis-single/run.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-trove-scenario-dsvm-redis-single from old job gate-trove-scenario-dsvm-redis-single-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 trove git://git.openstack.org/openstack/trove
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          ENABLED_SERVICES=tempest
-          ENABLED_SERVICES+=,s-proxy,s-object,s-container,s-account
-          ENABLED_SERVICES+=,trove,tr-api,tr-tmgr,tr-cond
-          export ENABLED_SERVICES
-
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TROVE=1
-          export PROJECTS="openstack/trove-dashboard $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-
-          function post_test_hook {
-              export BRIDGE_IP=10.1.0.1
-              export DEST=$BASE/new
-              export PATH_DEVSTACK_SRC=$DEST/devstack
-              cd /opt/stack/new/trove/integration/scripts
-              ./trovestack dsvm-gate-tests redis redis-supported-single
-          }
-          export -f post_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          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/trove-devstack-base.yaml b/playbooks/trove-devstack-base.yaml
new file mode 100644
index 00000000..0e0c9de0
--- /dev/null
+++ b/playbooks/trove-devstack-base.yaml
@@ -0,0 +1,4 @@
+- hosts: all
+  roles:
+    - run-devstack
+    - trove-devstack