From 07f5d7bd5860c4d407f83e82f3ec9b6dad9e7881 Mon Sep 17 00:00:00 2001
From: "Michal (inc0) Jastrzebski" <inc007@gmail.com>
Date: Mon, 2 Oct 2017 10:26:59 -0700
Subject: [PATCH] Removal of kolla legacy jobs

Co-Authored-By: Andreas Jaeger <aj@suse.com>
Change-Id: I998b19e2a4b59bd617a40768ec92ba077fe7f867
---
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  61 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  63 ----
 .../post.yaml                                 |  34 ---
 .../run.yaml                                  |  63 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  63 ----
 .../post.yaml                                 |  34 ---
 .../run.yaml                                  |  63 ----
 .../kolla-dsvm-build-ubuntu-binary/post.yaml  |  15 -
 .../kolla-dsvm-build-ubuntu-binary/run.yaml   |  62 ----
 .../kolla-dsvm-build-ubuntu-source/post.yaml  |  34 ---
 .../kolla-dsvm-build-ubuntu-source/run.yaml   |  62 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  63 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  63 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  63 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  63 ----
 .../kolla-dsvm-deploy-ubuntu-binary/post.yaml |  15 -
 .../kolla-dsvm-deploy-ubuntu-binary/run.yaml  |  62 ----
 .../kolla-dsvm-deploy-ubuntu-source/post.yaml |  15 -
 .../kolla-dsvm-deploy-ubuntu-source/run.yaml  |  62 ----
 .../post.yaml                                 |  34 ---
 .../run.yaml                                  |  63 ----
 .../post.yaml                                 |  34 ---
 .../run.yaml                                  |  64 -----
 .../post.yaml                                 |  34 ---
 .../run.yaml                                  |  63 ----
 .../post.yaml                                 |  34 ---
 .../run.yaml                                  |  64 -----
 zuul.d/zuul-legacy-jobs.yaml                  | 272 ------------------
 71 files changed, 3095 deletions(-)
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-centos-binary-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-centos-binary-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-centos-source-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-centos-source-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-binary-centos-7-2-node/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-binary-centos-7-2-node/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-source-centos-7-2-node/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-source-centos-7-2-node/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-binary-centos-7-2-node/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-binary-centos-7-2-node/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-source-centos-7-2-node/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-source-centos-7-2-node/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-binary-ubuntu-xenial-2-node/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-binary-ubuntu-xenial-2-node/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-source-ubuntu-xenial-2-node/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-source-ubuntu-xenial-2-node/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-binary-centos-7-2-node/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-binary-centos-7-2-node/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-binary-centos-7-2-node/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-binary-centos-7-2-node/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-source-centos-7-2-node/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-source-centos-7-2-node/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-binary-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-binary-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-source-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-source-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-binary/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-binary/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-source/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-source/run.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node/post.yaml
 delete mode 100644 playbooks/legacy/kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node/run.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-build-centos-binary-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-build-centos-binary-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-build-centos-source-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-build-centos-source-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-build-oraclelinux-binary-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-build-oraclelinux-binary-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-build-oraclelinux-source-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-build-oraclelinux-source-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-build-ubuntu-binary/post.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-build-ubuntu-binary/run.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-build-ubuntu-source/post.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-build-ubuntu-source/run.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-deploy-centos-binary-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-deploy-centos-binary-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-deploy-centos-source-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-deploy-centos-source-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-deploy-oraclelinux-binary-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-deploy-oraclelinux-binary-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-deploy-oraclelinux-source-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-deploy-oraclelinux-source-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-deploy-ubuntu-binary/post.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-deploy-ubuntu-binary/run.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-deploy-ubuntu-source/post.yaml
 delete mode 100644 playbooks/legacy/kolla-dsvm-deploy-ubuntu-source/run.yaml
 delete mode 100644 playbooks/legacy/publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post.yaml
 delete mode 100644 playbooks/legacy/publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run.yaml
 delete mode 100644 playbooks/legacy/publish-kolla-dsvm-build-ubuntu-source/post.yaml
 delete mode 100644 playbooks/legacy/publish-kolla-dsvm-build-ubuntu-source/run.yaml
 delete mode 100644 playbooks/legacy/publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post.yaml
 delete mode 100644 playbooks/legacy/publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run.yaml
 delete mode 100644 playbooks/legacy/publish-kolla-dsvm-save-ubuntu-source/post.yaml
 delete mode 100644 playbooks/legacy/publish-kolla-dsvm-save-ubuntu-source/run.yaml

diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-centos-binary-centos-7/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-centos-binary-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-centos-binary-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/legacy/kolla-ansible-dsvm-deploy-centos-binary-centos-7/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-centos-binary-centos-7/run.yaml
deleted file mode 100644
index 6f3ead5b..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-centos-binary-centos-7/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-centos-binary-centos-7
-    from old job gate-kolla-ansible-dsvm-deploy-centos-binary-centos-7-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy
-          export BASE_DISTRO=centos
-          export INSTALL_TYPE=binary
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-centos-source-centos-7/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-centos-source-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-centos-source-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/legacy/kolla-ansible-dsvm-deploy-centos-source-centos-7/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-centos-source-centos-7/run.yaml
deleted file mode 100644
index 502a6bbf..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-centos-source-centos-7/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-centos-source-centos-7
-    from old job gate-kolla-ansible-dsvm-deploy-centos-source-centos-7-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy
-          export BASE_DISTRO=centos
-          export INSTALL_TYPE=source
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-binary-centos-7-2-node/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-binary-centos-7-2-node/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-binary-centos-7-2-node/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/kolla-ansible-dsvm-deploy-ceph-centos-binary-centos-7-2-node/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-binary-centos-7-2-node/run.yaml
deleted file mode 100644
index 672e0ddb..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-binary-centos-7-2-node/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-ceph-centos-binary-centos-7-2-node
-    from old job gate-kolla-ansible-dsvm-deploy-ceph-centos-binary-centos-7-2-node-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy-ceph
-          export BASE_DISTRO=centos
-          export INSTALL_TYPE=binary
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-source-centos-7-2-node/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-source-centos-7-2-node/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-source-centos-7-2-node/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/kolla-ansible-dsvm-deploy-ceph-centos-source-centos-7-2-node/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-source-centos-7-2-node/run.yaml
deleted file mode 100644
index 0518a3b0..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-source-centos-7-2-node/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-ceph-centos-source-centos-7-2-node
-    from old job gate-kolla-ansible-dsvm-deploy-ceph-centos-source-centos-7-2-node-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy-ceph
-          export BASE_DISTRO=centos
-          export INSTALL_TYPE=source
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-binary-centos-7-2-node/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-binary-centos-7-2-node/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-binary-centos-7-2-node/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/kolla-ansible-dsvm-deploy-ceph-oraclelinux-binary-centos-7-2-node/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-binary-centos-7-2-node/run.yaml
deleted file mode 100644
index ebc8f749..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-binary-centos-7-2-node/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-ceph-oraclelinux-binary-centos-7-2-node
-    from old job gate-kolla-ansible-dsvm-deploy-ceph-oraclelinux-binary-centos-7-2-node-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy-ceph
-          export BASE_DISTRO=oraclelinux
-          export INSTALL_TYPE=binary
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-source-centos-7-2-node/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-source-centos-7-2-node/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-source-centos-7-2-node/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/kolla-ansible-dsvm-deploy-ceph-oraclelinux-source-centos-7-2-node/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-source-centos-7-2-node/run.yaml
deleted file mode 100644
index 5e124457..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-source-centos-7-2-node/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-ceph-oraclelinux-source-centos-7-2-node
-    from old job gate-kolla-ansible-dsvm-deploy-ceph-oraclelinux-source-centos-7-2-node-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy-ceph
-          export BASE_DISTRO=oraclelinux
-          export INSTALL_TYPE=source
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-binary-ubuntu-xenial-2-node/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-binary-ubuntu-xenial-2-node/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-binary-ubuntu-xenial-2-node/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/kolla-ansible-dsvm-deploy-ceph-ubuntu-binary-ubuntu-xenial-2-node/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-binary-ubuntu-xenial-2-node/run.yaml
deleted file mode 100644
index 22ca45b5..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-binary-ubuntu-xenial-2-node/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-ceph-ubuntu-binary-ubuntu-xenial-2-node
-    from old job gate-kolla-ansible-dsvm-deploy-ceph-ubuntu-binary-ubuntu-xenial-2-node-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy-ceph
-          export BASE_DISTRO=ubuntu
-          export INSTALL_TYPE=binary
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-source-ubuntu-xenial-2-node/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-source-ubuntu-xenial-2-node/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-source-ubuntu-xenial-2-node/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/kolla-ansible-dsvm-deploy-ceph-ubuntu-source-ubuntu-xenial-2-node/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-source-ubuntu-xenial-2-node/run.yaml
deleted file mode 100644
index 5c95a2c6..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-source-ubuntu-xenial-2-node/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-ceph-ubuntu-source-ubuntu-xenial-2-node
-    from old job gate-kolla-ansible-dsvm-deploy-ceph-ubuntu-source-ubuntu-xenial-2-node-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy-ceph
-          export BASE_DISTRO=ubuntu
-          export INSTALL_TYPE=source
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-binary-centos-7-2-node/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-binary-centos-7-2-node/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-binary-centos-7-2-node/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/kolla-ansible-dsvm-deploy-multinode-centos-binary-centos-7-2-node/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-binary-centos-7-2-node/run.yaml
deleted file mode 100644
index bdc93e4d..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-binary-centos-7-2-node/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-multinode-centos-binary-centos-7-2-node
-    from old job gate-kolla-ansible-dsvm-deploy-multinode-centos-binary-centos-7-2-node-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy-multinode
-          export BASE_DISTRO=centos
-          export INSTALL_TYPE=binary
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node/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/kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node/run.yaml
deleted file mode 100644
index ff27dfe2..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node
-    from old job gate-kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy-multinode
-          export BASE_DISTRO=centos
-          export INSTALL_TYPE=source
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-binary-centos-7-2-node/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-binary-centos-7-2-node/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-binary-centos-7-2-node/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/kolla-ansible-dsvm-deploy-multinode-oraclelinux-binary-centos-7-2-node/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-binary-centos-7-2-node/run.yaml
deleted file mode 100644
index 9c68f9dd..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-binary-centos-7-2-node/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-multinode-oraclelinux-binary-centos-7-2-node
-    from old job gate-kolla-ansible-dsvm-deploy-multinode-oraclelinux-binary-centos-7-2-node-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy-multinode
-          export BASE_DISTRO=oraclelinux
-          export INSTALL_TYPE=binary
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-source-centos-7-2-node/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-source-centos-7-2-node/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-source-centos-7-2-node/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/kolla-ansible-dsvm-deploy-multinode-oraclelinux-source-centos-7-2-node/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-source-centos-7-2-node/run.yaml
deleted file mode 100644
index 417493de..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-source-centos-7-2-node/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-multinode-oraclelinux-source-centos-7-2-node
-    from old job gate-kolla-ansible-dsvm-deploy-multinode-oraclelinux-source-centos-7-2-node-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy-multinode
-          export BASE_DISTRO=oraclelinux
-          export INSTALL_TYPE=source
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node/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/kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node/run.yaml
deleted file mode 100644
index 565a9fe1..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node
-    from old job gate-kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy-multinode
-          export BASE_DISTRO=ubuntu
-          export INSTALL_TYPE=binary
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/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/kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run.yaml
deleted file mode 100644
index a5cd1d9d..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node
-    from old job gate-kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy-multinode
-          export BASE_DISTRO=ubuntu
-          export INSTALL_TYPE=source
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-binary-centos-7/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-binary-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-binary-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/legacy/kolla-ansible-dsvm-deploy-oraclelinux-binary-centos-7/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-binary-centos-7/run.yaml
deleted file mode 100644
index 20034454..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-binary-centos-7/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-oraclelinux-binary-centos-7
-    from old job gate-kolla-ansible-dsvm-deploy-oraclelinux-binary-centos-7-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy
-          export BASE_DISTRO=oraclelinux
-          export INSTALL_TYPE=binary
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-source-centos-7/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-source-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-source-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/legacy/kolla-ansible-dsvm-deploy-oraclelinux-source-centos-7/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-source-centos-7/run.yaml
deleted file mode 100644
index 774b65e8..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-source-centos-7/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-oraclelinux-source-centos-7
-    from old job gate-kolla-ansible-dsvm-deploy-oraclelinux-source-centos-7-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy
-          export BASE_DISTRO=oraclelinux
-          export INSTALL_TYPE=source
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-binary/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-binary/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-binary/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/kolla-ansible-dsvm-deploy-ubuntu-binary/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-binary/run.yaml
deleted file mode 100644
index 26d9fd78..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-binary/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-ubuntu-binary from old
-    job gate-kolla-ansible-dsvm-deploy-ubuntu-binary-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy
-          export BASE_DISTRO=ubuntu
-          export INSTALL_TYPE=binary
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-source/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-source/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-source/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/kolla-ansible-dsvm-deploy-ubuntu-source/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-source/run.yaml
deleted file mode 100644
index 03c6ea73..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-source/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-ansible-dsvm-deploy-ubuntu-source from old
-    job gate-kolla-ansible-dsvm-deploy-ubuntu-source-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=deploy
-          export BASE_DISTRO=ubuntu
-          export INSTALL_TYPE=source
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node/post.yaml b/playbooks/legacy/kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node/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/kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node/run.yaml b/playbooks/legacy/kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node/run.yaml
deleted file mode 100644
index c591cfa1..00000000
--- a/playbooks/legacy/kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node
-    from old job gate-kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=upgrade-multinode
-          export BASE_DISTRO=centos
-          export INSTALL_TYPE=source
-          tools/setup_gate.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-dsvm-build-centos-binary-centos-7/post.yaml b/playbooks/legacy/kolla-dsvm-build-centos-binary-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-dsvm-build-centos-binary-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/legacy/kolla-dsvm-build-centos-binary-centos-7/run.yaml b/playbooks/legacy/kolla-dsvm-build-centos-binary-centos-7/run.yaml
deleted file mode 100644
index 5291e74c..00000000
--- a/playbooks/legacy/kolla-dsvm-build-centos-binary-centos-7/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-dsvm-build-centos-binary-centos-7 from old
-    job gate-kolla-dsvm-build-centos-binary-centos-7-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-
-          export ACTION=build
-          export BASE_DISTRO=centos
-          export INSTALL_TYPE=binary
-
-          tools/gate_run.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-dsvm-build-centos-source-centos-7/post.yaml b/playbooks/legacy/kolla-dsvm-build-centos-source-centos-7/post.yaml
deleted file mode 100644
index 34636c1b..00000000
--- a/playbooks/legacy/kolla-dsvm-build-centos-source-centos-7/post.yaml
+++ /dev/null
@@ -1,34 +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
-
-    - name: Ensure artifacts directory exists
-      file:
-        path: '{{ zuul.executor.work_root }}/artifacts'
-        state: directory
-      delegate_to: localhost
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.work_root }}/artifacts/images/'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/images/*.tar.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/kolla-dsvm-build-centos-source-centos-7/run.yaml b/playbooks/legacy/kolla-dsvm-build-centos-source-centos-7/run.yaml
deleted file mode 100644
index 10ad605a..00000000
--- a/playbooks/legacy/kolla-dsvm-build-centos-source-centos-7/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-dsvm-build-centos-source-centos-7 from old
-    job kolla-dsvm-build-centos-source-centos-7
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=build
-          export BASE_DISTRO=centos
-          export INSTALL_TYPE=source
-          export PACK_REGISTRY=1
-
-          tools/gate_run.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-dsvm-build-oraclelinux-binary-centos-7/post.yaml b/playbooks/legacy/kolla-dsvm-build-oraclelinux-binary-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-dsvm-build-oraclelinux-binary-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/legacy/kolla-dsvm-build-oraclelinux-binary-centos-7/run.yaml b/playbooks/legacy/kolla-dsvm-build-oraclelinux-binary-centos-7/run.yaml
deleted file mode 100644
index 55c5765b..00000000
--- a/playbooks/legacy/kolla-dsvm-build-oraclelinux-binary-centos-7/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-dsvm-build-oraclelinux-binary-centos-7 from
-    old job gate-kolla-dsvm-build-oraclelinux-binary-centos-7-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-
-          export ACTION=build
-          export BASE_DISTRO=oraclelinux
-          export INSTALL_TYPE=binary
-
-          tools/gate_run.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-dsvm-build-oraclelinux-source-centos-7/post.yaml b/playbooks/legacy/kolla-dsvm-build-oraclelinux-source-centos-7/post.yaml
deleted file mode 100644
index 34636c1b..00000000
--- a/playbooks/legacy/kolla-dsvm-build-oraclelinux-source-centos-7/post.yaml
+++ /dev/null
@@ -1,34 +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
-
-    - name: Ensure artifacts directory exists
-      file:
-        path: '{{ zuul.executor.work_root }}/artifacts'
-        state: directory
-      delegate_to: localhost
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.work_root }}/artifacts/images/'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/images/*.tar.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/kolla-dsvm-build-oraclelinux-source-centos-7/run.yaml b/playbooks/legacy/kolla-dsvm-build-oraclelinux-source-centos-7/run.yaml
deleted file mode 100644
index 6759253a..00000000
--- a/playbooks/legacy/kolla-dsvm-build-oraclelinux-source-centos-7/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-dsvm-build-oraclelinux-source-centos-7 from
-    old job kolla-dsvm-build-oraclelinux-source-centos-7
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=build
-          export BASE_DISTRO=oraclelinux
-          export INSTALL_TYPE=source
-          export PACK_REGISTRY=1
-
-          tools/gate_run.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-dsvm-build-ubuntu-binary/post.yaml b/playbooks/legacy/kolla-dsvm-build-ubuntu-binary/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-dsvm-build-ubuntu-binary/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/kolla-dsvm-build-ubuntu-binary/run.yaml b/playbooks/legacy/kolla-dsvm-build-ubuntu-binary/run.yaml
deleted file mode 100644
index 63675fe4..00000000
--- a/playbooks/legacy/kolla-dsvm-build-ubuntu-binary/run.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-dsvm-build-ubuntu-binary from old job gate-kolla-dsvm-build-ubuntu-binary-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-
-          export ACTION=build
-          export BASE_DISTRO=ubuntu
-          export INSTALL_TYPE=binary
-
-          tools/gate_run.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-dsvm-build-ubuntu-source/post.yaml b/playbooks/legacy/kolla-dsvm-build-ubuntu-source/post.yaml
deleted file mode 100644
index 34636c1b..00000000
--- a/playbooks/legacy/kolla-dsvm-build-ubuntu-source/post.yaml
+++ /dev/null
@@ -1,34 +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
-
-    - name: Ensure artifacts directory exists
-      file:
-        path: '{{ zuul.executor.work_root }}/artifacts'
-        state: directory
-      delegate_to: localhost
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.work_root }}/artifacts/images/'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/images/*.tar.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/kolla-dsvm-build-ubuntu-source/run.yaml b/playbooks/legacy/kolla-dsvm-build-ubuntu-source/run.yaml
deleted file mode 100644
index 2a45b7bf..00000000
--- a/playbooks/legacy/kolla-dsvm-build-ubuntu-source/run.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-dsvm-build-ubuntu-source from old job kolla-dsvm-build-ubuntu-source-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=build
-          export BASE_DISTRO=ubuntu
-          export INSTALL_TYPE=source
-          export PACK_REGISTRY=1
-
-          tools/gate_run.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-dsvm-deploy-centos-binary-centos-7/post.yaml b/playbooks/legacy/kolla-dsvm-deploy-centos-binary-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-dsvm-deploy-centos-binary-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/legacy/kolla-dsvm-deploy-centos-binary-centos-7/run.yaml b/playbooks/legacy/kolla-dsvm-deploy-centos-binary-centos-7/run.yaml
deleted file mode 100644
index a81ebb83..00000000
--- a/playbooks/legacy/kolla-dsvm-deploy-centos-binary-centos-7/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-dsvm-deploy-centos-binary-centos-7 from old
-    job gate-kolla-dsvm-deploy-centos-binary-centos-7-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-
-          export ACTION=deploy
-          export BASE_DISTRO=centos
-          export INSTALL_TYPE=binary
-
-          tools/gate_run.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-dsvm-deploy-centos-source-centos-7/post.yaml b/playbooks/legacy/kolla-dsvm-deploy-centos-source-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-dsvm-deploy-centos-source-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/legacy/kolla-dsvm-deploy-centos-source-centos-7/run.yaml b/playbooks/legacy/kolla-dsvm-deploy-centos-source-centos-7/run.yaml
deleted file mode 100644
index 6809f6d2..00000000
--- a/playbooks/legacy/kolla-dsvm-deploy-centos-source-centos-7/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-dsvm-deploy-centos-source-centos-7 from old
-    job gate-kolla-dsvm-deploy-centos-source-centos-7-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-
-          export ACTION=deploy
-          export BASE_DISTRO=centos
-          export INSTALL_TYPE=source
-
-          tools/gate_run.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-dsvm-deploy-oraclelinux-binary-centos-7/post.yaml b/playbooks/legacy/kolla-dsvm-deploy-oraclelinux-binary-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-dsvm-deploy-oraclelinux-binary-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/legacy/kolla-dsvm-deploy-oraclelinux-binary-centos-7/run.yaml b/playbooks/legacy/kolla-dsvm-deploy-oraclelinux-binary-centos-7/run.yaml
deleted file mode 100644
index dcb9a5ee..00000000
--- a/playbooks/legacy/kolla-dsvm-deploy-oraclelinux-binary-centos-7/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-dsvm-deploy-oraclelinux-binary-centos-7 from
-    old job gate-kolla-dsvm-deploy-oraclelinux-binary-centos-7-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-
-          export ACTION=deploy
-          export BASE_DISTRO=oraclelinux
-          export INSTALL_TYPE=binary
-
-          tools/gate_run.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-dsvm-deploy-oraclelinux-source-centos-7/post.yaml b/playbooks/legacy/kolla-dsvm-deploy-oraclelinux-source-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-dsvm-deploy-oraclelinux-source-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/legacy/kolla-dsvm-deploy-oraclelinux-source-centos-7/run.yaml b/playbooks/legacy/kolla-dsvm-deploy-oraclelinux-source-centos-7/run.yaml
deleted file mode 100644
index b43a8c25..00000000
--- a/playbooks/legacy/kolla-dsvm-deploy-oraclelinux-source-centos-7/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-dsvm-deploy-oraclelinux-source-centos-7 from
-    old job gate-kolla-dsvm-deploy-oraclelinux-source-centos-7-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-
-          export ACTION=deploy
-          export BASE_DISTRO=oraclelinux
-          export INSTALL_TYPE=source
-
-          tools/gate_run.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-dsvm-deploy-ubuntu-binary/post.yaml b/playbooks/legacy/kolla-dsvm-deploy-ubuntu-binary/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-dsvm-deploy-ubuntu-binary/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/kolla-dsvm-deploy-ubuntu-binary/run.yaml b/playbooks/legacy/kolla-dsvm-deploy-ubuntu-binary/run.yaml
deleted file mode 100644
index c3a4b1ec..00000000
--- a/playbooks/legacy/kolla-dsvm-deploy-ubuntu-binary/run.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-dsvm-deploy-ubuntu-binary from old job gate-kolla-dsvm-deploy-ubuntu-binary-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-
-          export ACTION=deploy
-          export BASE_DISTRO=ubuntu
-          export INSTALL_TYPE=binary
-
-          tools/gate_run.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/kolla-dsvm-deploy-ubuntu-source/post.yaml b/playbooks/legacy/kolla-dsvm-deploy-ubuntu-source/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/kolla-dsvm-deploy-ubuntu-source/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/kolla-dsvm-deploy-ubuntu-source/run.yaml b/playbooks/legacy/kolla-dsvm-deploy-ubuntu-source/run.yaml
deleted file mode 100644
index 93afa21d..00000000
--- a/playbooks/legacy/kolla-dsvm-deploy-ubuntu-source/run.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-kolla-dsvm-deploy-ubuntu-source from old job gate-kolla-dsvm-deploy-ubuntu-source-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-
-          export ACTION=deploy
-          export BASE_DISTRO=ubuntu
-          export INSTALL_TYPE=source
-
-          tools/gate_run.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post.yaml b/playbooks/legacy/publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post.yaml
deleted file mode 100644
index 4a816073..00000000
--- a/playbooks/legacy/publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post.yaml
+++ /dev/null
@@ -1,34 +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
-
-    - name: Ensure artifacts directory exists
-      file:
-        path: '{{ zuul.executor.work_root }}/artifacts'
-        state: directory
-      delegate_to: localhost
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.work_root }}/artifacts/images/tmp'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/images/*.txt
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run.yaml b/playbooks/legacy/publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run.yaml
deleted file mode 100644
index 435821b4..00000000
--- a/playbooks/legacy/publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node
-    from old job publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ORCH_ENGINE=ansible
-          export ACTION=deploy-multinode
-          export BASE_DISTRO=ubuntu
-          export INSTALL_TYPE=source
-
-          tools/publisher.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/publish-kolla-dsvm-build-ubuntu-source/post.yaml b/playbooks/legacy/publish-kolla-dsvm-build-ubuntu-source/post.yaml
deleted file mode 100644
index 9517aa3d..00000000
--- a/playbooks/legacy/publish-kolla-dsvm-build-ubuntu-source/post.yaml
+++ /dev/null
@@ -1,34 +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
-
-    - name: Ensure artifacts directory exists
-      file:
-        path: '{{ zuul.executor.work_root }}/artifacts'
-        state: directory
-      delegate_to: localhost
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.work_root }}/artifacts/images/tmp'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/images/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/publish-kolla-dsvm-build-ubuntu-source/run.yaml b/playbooks/legacy/publish-kolla-dsvm-build-ubuntu-source/run.yaml
deleted file mode 100644
index 81c5f990..00000000
--- a/playbooks/legacy/publish-kolla-dsvm-build-ubuntu-source/run.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-publish-kolla-dsvm-build-ubuntu-source from old job
-    publish-kolla-dsvm-build-ubuntu-source-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=build
-          export BASE_DISTRO=ubuntu
-          export INSTALL_TYPE=source
-          export PACK_REGISTRY=1
-          export PUBLISHER=1
-
-          tools/publisher.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post.yaml b/playbooks/legacy/publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post.yaml
deleted file mode 100644
index 4a816073..00000000
--- a/playbooks/legacy/publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post.yaml
+++ /dev/null
@@ -1,34 +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
-
-    - name: Ensure artifacts directory exists
-      file:
-        path: '{{ zuul.executor.work_root }}/artifacts'
-        state: directory
-      delegate_to: localhost
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.work_root }}/artifacts/images/tmp'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/images/*.txt
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run.yaml b/playbooks/legacy/publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run.yaml
deleted file mode 100644
index 81d1d92a..00000000
--- a/playbooks/legacy/publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- hosts: primary
-  name: Autoconverted job legacy-publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node
-    from old job publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ORCH_ENGINE=kubernetes
-          export ACTION=deploy-multinode
-          export BASE_DISTRO=ubuntu
-          export INSTALL_TYPE=source
-
-          tools/publisher.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/publish-kolla-dsvm-save-ubuntu-source/post.yaml b/playbooks/legacy/publish-kolla-dsvm-save-ubuntu-source/post.yaml
deleted file mode 100644
index 9517aa3d..00000000
--- a/playbooks/legacy/publish-kolla-dsvm-save-ubuntu-source/post.yaml
+++ /dev/null
@@ -1,34 +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
-
-    - name: Ensure artifacts directory exists
-      file:
-        path: '{{ zuul.executor.work_root }}/artifacts'
-        state: directory
-      delegate_to: localhost
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.work_root }}/artifacts/images/tmp'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/images/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/publish-kolla-dsvm-save-ubuntu-source/run.yaml b/playbooks/legacy/publish-kolla-dsvm-save-ubuntu-source/run.yaml
deleted file mode 100644
index 2dc71552..00000000
--- a/playbooks/legacy/publish-kolla-dsvm-save-ubuntu-source/run.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-publish-kolla-dsvm-save-ubuntu-source from old job
-    publish-kolla-dsvm-save-ubuntu-source-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export ACTION=save
-          export BASE_DISTRO=ubuntu
-          export INSTALL_TYPE=source
-          export PACK_REGISTRY=1
-          export PUBLISHER=1
-
-          tools/publisher.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml
index 06e385d0..b8ac5023 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -3062,248 +3062,6 @@
       - openstack-infra/devstack-gate
       - openstack/kingbird
 
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-centos-binary-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-centos-binary-centos-7/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-centos-binary-centos-7/post
-    timeout: 5400
-    nodeset: legacy-centos-7
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-centos-source-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-centos-source-centos-7/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-centos-source-centos-7/post
-    timeout: 5400
-    nodeset: legacy-centos-7
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-ceph-centos-binary-centos-7-2-node
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-binary-centos-7-2-node/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-binary-centos-7-2-node/post
-    timeout: 5400
-    nodeset: legacy-centos-7-2-node
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-ceph-centos-source-centos-7-2-node
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-source-centos-7-2-node/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-centos-source-centos-7-2-node/post
-    timeout: 5400
-    nodeset: legacy-centos-7-2-node
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-ceph-oraclelinux-binary-centos-7-2-node
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-binary-centos-7-2-node/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-binary-centos-7-2-node/post
-    timeout: 5400
-    nodeset: legacy-centos-7-2-node
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-ceph-oraclelinux-source-centos-7-2-node
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-source-centos-7-2-node/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-oraclelinux-source-centos-7-2-node/post
-    timeout: 5400
-    nodeset: legacy-centos-7-2-node
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-ceph-ubuntu-binary-ubuntu-xenial-2-node
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-binary-ubuntu-xenial-2-node/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-binary-ubuntu-xenial-2-node/post
-    timeout: 5400
-    nodeset: legacy-ubuntu-xenial-2-node
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-ceph-ubuntu-source-ubuntu-xenial-2-node
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-source-ubuntu-xenial-2-node/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-ceph-ubuntu-source-ubuntu-xenial-2-node/post
-    timeout: 5400
-    nodeset: legacy-ubuntu-xenial-2-node
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-multinode-centos-binary-centos-7-2-node
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-binary-centos-7-2-node/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-binary-centos-7-2-node/post
-    timeout: 5400
-    nodeset: legacy-centos-7-2-node
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-centos-source-centos-7-2-node/post
-    timeout: 5400
-    nodeset: legacy-centos-7-2-node
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-multinode-oraclelinux-binary-centos-7-2-node
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-binary-centos-7-2-node/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-binary-centos-7-2-node/post
-    timeout: 5400
-    nodeset: legacy-centos-7-2-node
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-multinode-oraclelinux-source-centos-7-2-node
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-source-centos-7-2-node/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-oraclelinux-source-centos-7-2-node/post
-    timeout: 5400
-    nodeset: legacy-centos-7-2-node
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-binary-ubuntu-xenial-2-node/post
-    timeout: 5400
-    nodeset: legacy-ubuntu-xenial-2-node
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post
-    timeout: 5400
-    nodeset: legacy-ubuntu-xenial-2-node
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-oraclelinux-binary-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-binary-centos-7/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-binary-centos-7/post
-    timeout: 5400
-    nodeset: legacy-centos-7
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-oraclelinux-source-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-source-centos-7/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-oraclelinux-source-centos-7/post
-    timeout: 5400
-    nodeset: legacy-centos-7
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-ubuntu-binary
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-binary/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-binary/post
-    timeout: 5400
-
-- job:
-    name: legacy-kolla-ansible-dsvm-deploy-ubuntu-source
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-source/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-deploy-ubuntu-source/post
-    timeout: 5400
-
-- job:
-    name: legacy-kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node/run
-    post-run: playbooks/legacy/kolla-ansible-dsvm-upgrade-multinode-centos-source-centos-7-2-node/post
-    timeout: 5400
-    nodeset: legacy-centos-7-2-node
-
-- job:
-    name: legacy-kolla-dsvm-build-centos-binary-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-dsvm-build-centos-binary-centos-7/run
-    post-run: playbooks/legacy/kolla-dsvm-build-centos-binary-centos-7/post
-    timeout: 7200
-    nodeset: legacy-centos-7
-
-- job:
-    name: legacy-kolla-dsvm-build-centos-source-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-dsvm-build-centos-source-centos-7/run
-    post-run: playbooks/legacy/kolla-dsvm-build-centos-source-centos-7/post
-    timeout: 7200
-    nodeset: legacy-centos-7
-
-- job:
-    name: legacy-kolla-dsvm-build-oraclelinux-binary-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-dsvm-build-oraclelinux-binary-centos-7/run
-    post-run: playbooks/legacy/kolla-dsvm-build-oraclelinux-binary-centos-7/post
-    timeout: 7200
-    nodeset: legacy-centos-7
-
-- job:
-    name: legacy-kolla-dsvm-build-oraclelinux-source-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-dsvm-build-oraclelinux-source-centos-7/run
-    post-run: playbooks/legacy/kolla-dsvm-build-oraclelinux-source-centos-7/post
-    timeout: 7200
-    nodeset: legacy-centos-7
-
-- job:
-    name: legacy-kolla-dsvm-build-ubuntu-binary
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-dsvm-build-ubuntu-binary/run
-    post-run: playbooks/legacy/kolla-dsvm-build-ubuntu-binary/post
-    timeout: 7200
-
-- job:
-    name: legacy-kolla-dsvm-build-ubuntu-source
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-dsvm-build-ubuntu-source/run
-    post-run: playbooks/legacy/kolla-dsvm-build-ubuntu-source/post
-    timeout: 7200
-
-- job:
-    name: legacy-kolla-dsvm-deploy-centos-binary-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-dsvm-deploy-centos-binary-centos-7/run
-    post-run: playbooks/legacy/kolla-dsvm-deploy-centos-binary-centos-7/post
-    timeout: 7200
-    nodeset: legacy-centos-7
-
-- job:
-    name: legacy-kolla-dsvm-deploy-centos-source-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-dsvm-deploy-centos-source-centos-7/run
-    post-run: playbooks/legacy/kolla-dsvm-deploy-centos-source-centos-7/post
-    timeout: 7200
-    nodeset: legacy-centos-7
-
-- job:
-    name: legacy-kolla-dsvm-deploy-oraclelinux-binary-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-dsvm-deploy-oraclelinux-binary-centos-7/run
-    post-run: playbooks/legacy/kolla-dsvm-deploy-oraclelinux-binary-centos-7/post
-    timeout: 7200
-    nodeset: legacy-centos-7
-
-- job:
-    name: legacy-kolla-dsvm-deploy-oraclelinux-source-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-dsvm-deploy-oraclelinux-source-centos-7/run
-    post-run: playbooks/legacy/kolla-dsvm-deploy-oraclelinux-source-centos-7/post
-    timeout: 7200
-    nodeset: legacy-centos-7
-
-- job:
-    name: legacy-kolla-dsvm-deploy-ubuntu-binary
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-dsvm-deploy-ubuntu-binary/run
-    post-run: playbooks/legacy/kolla-dsvm-deploy-ubuntu-binary/post
-    timeout: 7200
-
-- job:
-    name: legacy-kolla-dsvm-deploy-ubuntu-source
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/kolla-dsvm-deploy-ubuntu-source/run
-    post-run: playbooks/legacy/kolla-dsvm-deploy-ubuntu-source/post
-    timeout: 7200
-
 - job:
     name: legacy-kolla-kubernetes-deploy-centos-binary-2-ceph
     parent: legacy-kolla-kubernetes-base
@@ -6997,36 +6755,6 @@
     run: playbooks/legacy/project-team-guide-publish/run
     timeout: 1800
 
-- job:
-    name: legacy-publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run
-    post-run: playbooks/legacy/publish-kolla-dsvm-ansible-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post
-    timeout: 7200
-    nodeset: legacy-ubuntu-xenial-2-node
-
-- job:
-    name: legacy-publish-kolla-dsvm-build-ubuntu-source
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/publish-kolla-dsvm-build-ubuntu-source/run
-    post-run: playbooks/legacy/publish-kolla-dsvm-build-ubuntu-source/post
-    timeout: 7200
-
-- job:
-    name: legacy-publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node
-    parent: legacy-dsvm-base-multinode
-    run: playbooks/legacy/publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/run
-    post-run: playbooks/legacy/publish-kolla-dsvm-kubernetes-deploy-multinode-ubuntu-source-ubuntu-xenial-2-node/post
-    timeout: 7200
-    nodeset: legacy-ubuntu-xenial-2-node
-
-- job:
-    name: legacy-publish-kolla-dsvm-save-ubuntu-source
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/publish-kolla-dsvm-save-ubuntu-source/run
-    post-run: playbooks/legacy/publish-kolla-dsvm-save-ubuntu-source/post
-    timeout: 7200
-
 - job:
     name: legacy-puppet-beaker-rspec
     parent: legacy-puppet-openstack-integration