diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/post.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/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/dib-dsvm-functests-python2-centos-7-extras/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml
deleted file mode 100644
index ea3e3c498..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-extras/run.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-dib-dsvm-functests-python2-centos-7-extras from old
-    job gate-dib-dsvm-functests-python2-centos-7-extras-nv
-  roles:
-    - bindep
-
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          cd ~
-
-          /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            git://git.openstack.org \
-            openstack/diskimage-builder \
-            openstack/requirements
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          #
-          # We do things that might exceed the default 2GiB tmpfs, and
-          # use the larger mounted space.
-          cd ~
-          sudo mkdir /opt/dib_cache
-          sudo chown zuul:zuul /opt/dib_cache
-          export DIB_NO_TMPFS=1
-          export TMPDIR=/opt/dib_cache
-
-          virtualenv -p python2 env
-
-          export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
-          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
-          ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
-          # TODO(pabelanger): Remove once we migrated to bindep
-          ./openstack/diskimage-builder/tests/install_test_deps.sh
-
-          # This sets up some repo files pointing to the infra mirrors
-          # which are used during test runs
-          ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
-          # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
-          # build, unset it
-          unset UPPER_CONSTRAINTS_FILE
-
-          # activate the virtualenv so that any tools run by dib run
-          # using the python inside it
-          set +u
-          source ./env/bin/activate
-          set -u
-
-          ./openstack/diskimage-builder/tests/run_functests.sh \
-            gentoo/build-succeeds \
-            debian-minimal/stable-vm
-
-          set +u
-          deactivate
-          set -u
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/post.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/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/dib-dsvm-functests-python2-centos-7-image/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml
deleted file mode 100644
index 63dbc4517..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7-image/run.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-dib-dsvm-functests-python2-centos-7-image from old
-    job gate-dib-dsvm-functests-python2-centos-7-image-nv
-  roles:
-    - bindep
-
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          cd ~
-
-          /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            git://git.openstack.org \
-            openstack/diskimage-builder \
-            openstack/requirements
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          #
-          # We do things that might exceed the default 2GiB tmpfs, and
-          # use the larger mounted space.
-          cd ~
-          sudo mkdir /opt/dib_cache
-          sudo chown zuul:zuul /opt/dib_cache
-          export DIB_NO_TMPFS=1
-          export TMPDIR=/opt/dib_cache
-
-          virtualenv -p python2 env
-
-          export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
-          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
-          ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
-          # TODO(pabelanger): Remove once we migrated to bindep
-          ./openstack/diskimage-builder/tests/install_test_deps.sh
-
-          # This sets up some repo files pointing to the infra mirrors
-          # which are used during test runs
-          ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
-          # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
-          # build, unset it
-          unset UPPER_CONSTRAINTS_FILE
-
-          # activate the virtualenv so that any tools run by dib run
-          # using the python inside it
-          set +u
-          source ./env/bin/activate
-          set -u
-          ./openstack/diskimage-builder/tests/run_functests.sh \
-            centos7/build-succeeds \
-            opensuse/build-succeeds \
-            opensuse/opensuse423-build-succeeds \
-            fedora/build-succeeds \
-            ubuntu/xenial-build-succeeds \
-            ubuntu/bionic-build-succeeds
-
-          set +u
-          deactivate
-          set -u
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-centos-7/post.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-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/dib-dsvm-functests-python2-centos-7/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml
deleted file mode 100644
index 39e8eafce..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-centos-7/run.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-dib-dsvm-functests-python2-centos-7 from old job
-    gate-dib-dsvm-functests-python2-centos-7
-  roles:
-    - bindep
-
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          cd ~
-
-          /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            git://git.openstack.org \
-            openstack/diskimage-builder \
-            openstack/requirements
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          #
-          # We do things that might exceed the default 2GiB tmpfs, and
-          # use the larger mounted space.
-          cd ~
-          sudo mkdir /opt/dib_cache
-          sudo chown zuul:zuul /opt/dib_cache
-          export DIB_NO_TMPFS=1
-          export TMPDIR=/opt/dib_cache
-
-          virtualenv -p python2 env
-
-          export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
-          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
-          ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-          # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
-          # build, unset it
-          unset UPPER_CONSTRAINTS_FILE
-
-          # TODO(pabelanger): Remove once we migrated to bindep
-          ./openstack/diskimage-builder/tests/install_test_deps.sh
-
-          # This sets up some repo files pointing to the infra mirrors
-          # which are used during test runs
-          ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
-          # activate the virtualenv so that any tools run by dib run
-          # using the python inside it
-          set +u
-          source ./env/bin/activate
-          set -u
-          ./openstack/diskimage-builder/tests/run_functests.sh
-          set +u
-          deactivate
-          set -u
-
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/post.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/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/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml
deleted file mode 100644
index 61013d2fb..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-extras/run.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-dib-dsvm-functests-python2-ubuntu-trusty-extras from
-    old job gate-dib-dsvm-functests-python2-ubuntu-trusty-extras-nv
-  roles:
-    - bindep
-
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          cd ~
-
-          /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            git://git.openstack.org \
-            openstack/diskimage-builder \
-            openstack/requirements
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          #
-          # We do things that might exceed the default 2GiB tmpfs, and
-          # use the larger mounted space.
-          cd ~
-          sudo mkdir /opt/dib_cache
-          sudo chown zuul:zuul /opt/dib_cache
-          export DIB_NO_TMPFS=1
-          export TMPDIR=/opt/dib_cache
-
-          virtualenv -p python2 env
-
-          export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
-          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
-          ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
-          # TODO(pabelanger): Remove once we migrated to bindep
-          ./openstack/diskimage-builder/tests/install_test_deps.sh
-
-          # This sets up some repo files pointing to the infra mirrors
-          # which are used during test runs
-          ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
-          # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
-          # build, unset it
-          unset UPPER_CONSTRAINTS_FILE
-
-          # activate the virtualenv so that any tools run by dib run
-          # using the python inside it
-          set +u
-          source ./env/bin/activate
-          set -u
-
-          ./openstack/diskimage-builder/tests/run_functests.sh \
-            gentoo/build-succeeds \
-            debian-minimal/stable-vm
-
-          set +u
-          deactivate
-          set -u
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/post.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/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/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml
deleted file mode 100644
index bd08b9526..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty-image/run.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-dib-dsvm-functests-python2-ubuntu-trusty-image from
-    old job gate-dib-dsvm-functests-python2-ubuntu-trusty-image-nv
-  roles:
-    - bindep
-
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          cd ~
-
-          /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            git://git.openstack.org \
-            openstack/diskimage-builder \
-            openstack/requirements
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          #
-          # We do things that might exceed the default 2GiB tmpfs, and
-          # use the larger mounted space.
-          cd ~
-          sudo mkdir /opt/dib_cache
-          sudo chown zuul:zuul /opt/dib_cache
-          export DIB_NO_TMPFS=1
-          export TMPDIR=/opt/dib_cache
-
-          virtualenv -p python2 env
-
-          export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
-          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
-          ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
-          # TODO(pabelanger): Remove once we migrated to bindep
-          ./openstack/diskimage-builder/tests/install_test_deps.sh
-
-          # This sets up some repo files pointing to the infra mirrors
-          # which are used during test runs
-          ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
-          # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
-          # build, unset it
-          unset UPPER_CONSTRAINTS_FILE
-
-          # activate the virtualenv so that any tools run by dib run
-          # using the python inside it
-          set +u
-          source ./env/bin/activate
-          set -u
-
-          ./openstack/diskimage-builder/tests/run_functests.sh \
-            centos7/build-succeeds \
-            opensuse/build-succeeds \
-            opensuse/opensuse423-build-succeeds \
-            fedora/build-succeeds \
-            ubuntu/trusty-build-succeeds \
-            ubuntu/xenial-build-succeeds
-
-          set +u
-          deactivate
-          set -u
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/post.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/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/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml b/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml
deleted file mode 100644
index 773e8f725..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python2-ubuntu-trusty/run.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-dib-dsvm-functests-python2-ubuntu-trusty from old
-    job gate-dib-dsvm-functests-python2-ubuntu-trusty
-  roles:
-    - bindep
-
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          cd ~
-
-          /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            git://git.openstack.org \
-            openstack/diskimage-builder \
-            openstack/requirements
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          #
-          # We do things that might exceed the default 2GiB tmpfs, and
-          # use the larger mounted space.
-          cd ~
-          sudo mkdir /opt/dib_cache
-          sudo chown zuul:zuul /opt/dib_cache
-          export DIB_NO_TMPFS=1
-          export TMPDIR=/opt/dib_cache
-
-          virtualenv -p python2 env
-
-          export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
-          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
-          ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
-          # TODO(pabelanger): Remove once we migrated to bindep
-          ./openstack/diskimage-builder/tests/install_test_deps.sh
-
-          # This sets up some repo files pointing to the infra mirrors
-          # which are used during test runs
-          ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
-          # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
-          # build, unset it
-          unset UPPER_CONSTRAINTS_FILE
-
-          # activate the virtualenv so that any tools run by dib run
-          # using the python inside it
-          set +u
-          source ./env/bin/activate
-          set -u
-
-          ./openstack/diskimage-builder/tests/run_functests.sh
-
-          set +u
-          deactivate
-          set -u
-
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python3-extras/post.yaml b/playbooks/legacy/dib-dsvm-functests-python3-extras/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python3-extras/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/dib-dsvm-functests-python3-extras/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml
deleted file mode 100644
index fd41700e2..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python3-extras/run.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-dib-dsvm-functests-python3-extras from old job gate-dib-dsvm-functests-python3-ubuntu-xenial-extras-nv
-  roles:
-    - bindep
-
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          cd ~
-
-          /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            git://git.openstack.org \
-            openstack/diskimage-builder \
-            openstack/requirements
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          #
-          # We do things that might exceed the default 2GiB tmpfs, and
-          # use the larger mounted space.
-          cd ~
-          sudo mkdir /opt/dib_cache
-          sudo chown zuul:zuul /opt/dib_cache
-          export DIB_NO_TMPFS=1
-          export TMPDIR=/opt/dib_cache
-
-          virtualenv -p python3 env
-
-          export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
-          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
-          ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
-          # TODO(pabelanger): Remove once we migrated to bindep
-          ./openstack/diskimage-builder/tests/install_test_deps.sh
-
-          # This sets up some repo files pointing to the infra mirrors
-          # which are used during test runs
-          ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
-          # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
-          # build, unset it
-          unset UPPER_CONSTRAINTS_FILE
-
-          # activate the virtualenv so that any tools run by dib run
-          # using the python inside it
-          set +u
-          source ./env/bin/activate
-          set -u
-
-          ./openstack/diskimage-builder/tests/run_functests.sh \
-            gentoo/build-succeeds \
-            debian-minimal/stable-vm \
-            opensuse-minimal/opensuse423-build-succeeds
-
-          set +u
-          deactivate
-          set -u
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python3-image/post.yaml b/playbooks/legacy/dib-dsvm-functests-python3-image/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python3-image/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/dib-dsvm-functests-python3-image/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml
deleted file mode 100644
index 8ef5ee2cf..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python3-image/run.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-dib-dsvm-functests-python3-image from old job gate-dib-dsvm-functests-python3-ubuntu-xenial-image-nv
-  roles:
-    - bindep
-
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          cd ~
-
-          /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            git://git.openstack.org \
-            openstack/diskimage-builder \
-            openstack/requirements
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          #
-          # We do things that might exceed the default 2GiB tmpfs, and
-          # use the larger mounted space.
-          cd ~
-          sudo mkdir /opt/dib_cache
-          sudo chown zuul:zuul /opt/dib_cache
-          export DIB_NO_TMPFS=1
-          export TMPDIR=/opt/dib_cache
-
-          virtualenv -p python3 env
-
-          export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
-          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
-          ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
-          # TODO(pabelanger): Remove once we migrated to bindep
-          ./openstack/diskimage-builder/tests/install_test_deps.sh
-
-          # This sets up some repo files pointing to the infra mirrors
-          # which are used during test runs
-          ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
-          # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
-          # build, unset it
-          unset UPPER_CONSTRAINTS_FILE
-
-          # activate the virtualenv so that any tools run by dib run
-          # using the python inside it
-          set +u
-          source ./env/bin/activate
-          set -u
-
-          ./openstack/diskimage-builder/tests/run_functests.sh \
-            centos7/build-succeeds \
-            opensuse/build-succeeds \
-            opensuse/opensuse423-build-succeeds \
-            fedora/build-succeeds \
-            ubuntu/xenial-build-succeeds \
-            ubuntu/bionic-build-succeeds
-
-          set +u
-          deactivate
-          set -u
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/dib-dsvm-functests-python3/post.yaml b/playbooks/legacy/dib-dsvm-functests-python3/post.yaml
deleted file mode 100644
index e07f5510a..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python3/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/dib-dsvm-functests-python3/run.yaml b/playbooks/legacy/dib-dsvm-functests-python3/run.yaml
deleted file mode 100644
index 840643ffc..000000000
--- a/playbooks/legacy/dib-dsvm-functests-python3/run.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-dib-dsvm-functests-python3 from old job gate-dib-dsvm-functests-python3-ubuntu-xenial
-  roles:
-    - bindep
-
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          cd ~
-
-          /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \
-            git://git.openstack.org \
-            openstack/diskimage-builder \
-            openstack/requirements
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -u
-          set -e
-          set -x
-          #
-          # We do things that might exceed the default 2GiB tmpfs, and
-          # use the larger mounted space.
-          cd ~
-          sudo mkdir /opt/dib_cache
-          sudo chown zuul:zuul /opt/dib_cache
-          export DIB_NO_TMPFS=1
-          export TMPDIR=/opt/dib_cache
-
-          virtualenv -p python2 env
-
-          export UPPER_CONSTRAINTS_FILE=$(pwd)/openstack/requirements/upper-constraints.txt
-          sed -i '/^diskimage-builder/d' $UPPER_CONSTRAINTS_FILE
-          ./env/bin/pip install $(pwd)/openstack/diskimage-builder -c $UPPER_CONSTRAINTS_FILE
-
-          # TODO(pabelanger): Remove once we migrated to bindep
-          ./openstack/diskimage-builder/tests/install_test_deps.sh
-
-          # This sets up some repo files pointing to the infra mirrors
-          # which are used during test runs
-          ./openstack/diskimage-builder/contrib/setup-gate-mirrors.sh
-
-          # UPPER_CONSTRAINTS_FILE is causing side effects when doing image
-          # build, unset it
-          unset UPPER_CONSTRAINTS_FILE
-
-          # activate the virtualenv so that any tools run by dib run
-          # using the python inside it
-          set +u
-          source ./env/bin/activate
-          set -u
-
-          ./openstack/diskimage-builder/tests/run_functests.sh
-
-          set +u
-          deactivate
-          set -u
-
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'