diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-api-namespace/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-api-namespace/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-api-namespace/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/neutron-lbaasv2-dsvm-api-namespace/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-api-namespace/run.yaml
deleted file mode 100644
index c4922535..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-api-namespace/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-neutron-lbaasv2-dsvm-api-namespace from old job gate-neutron-lbaasv2-dsvm-api-namespace-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export PROJECTS="openstack/octavia $PROJECTS"
-
-          function gate_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 api-namespace
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 api-namespace
-          }
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-api/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-api/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-api/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/neutron-lbaasv2-dsvm-api/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-api/run.yaml
deleted file mode 100644
index b742982d..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-api/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-neutron-lbaasv2-dsvm-api from old job gate-neutron-lbaasv2-dsvm-api-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export PROJECTS="openstack/octavia $PROJECTS"
-
-          function gate_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 api
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 api
-          }
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-healthmonitor/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-healthmonitor/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-healthmonitor/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/neutron-lbaasv2-dsvm-healthmonitor/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-healthmonitor/run.yaml
deleted file mode 100644
index c6c6a058..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-healthmonitor/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-neutron-lbaasv2-dsvm-healthmonitor from old job gate-neutron-lbaasv2-dsvm-healthmonitor-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export PROJECTS="openstack/octavia $PROJECTS"
-
-          function gate_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 healthmonitor
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 healthmonitor
-          }
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-listener/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-listener/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-listener/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/neutron-lbaasv2-dsvm-listener/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-listener/run.yaml
deleted file mode 100644
index 053de817..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-listener/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-neutron-lbaasv2-dsvm-listener from old job gate-neutron-lbaasv2-dsvm-listener-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export PROJECTS="openstack/octavia $PROJECTS"
-
-          function gate_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 listener
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 listener
-          }
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-loadbalancer/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-loadbalancer/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-loadbalancer/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/neutron-lbaasv2-dsvm-loadbalancer/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-loadbalancer/run.yaml
deleted file mode 100644
index 00f0f7c6..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-loadbalancer/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-neutron-lbaasv2-dsvm-loadbalancer from old job gate-neutron-lbaasv2-dsvm-loadbalancer-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export PROJECTS="openstack/octavia $PROJECTS"
-
-          function gate_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 loadbalancer
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 loadbalancer
-          }
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-member/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-member/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-member/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/neutron-lbaasv2-dsvm-member/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-member/run.yaml
deleted file mode 100644
index 001c1e30..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-member/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-neutron-lbaasv2-dsvm-member from old job gate-neutron-lbaasv2-dsvm-member-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export PROJECTS="openstack/octavia $PROJECTS"
-
-          function gate_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 member
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 member
-          }
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-minimal/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-minimal/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-minimal/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/neutron-lbaasv2-dsvm-minimal/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-minimal/run.yaml
deleted file mode 100644
index b709bf0b..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-minimal/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-neutron-lbaasv2-dsvm-minimal from old job gate-neutron-lbaasv2-dsvm-minimal-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export PROJECTS="openstack/octavia $PROJECTS"
-
-          function gate_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 minimal
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 minimal
-          }
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-pool/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-pool/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-pool/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/neutron-lbaasv2-dsvm-pool/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-pool/run.yaml
deleted file mode 100644
index eb9979dc..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-pool/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-neutron-lbaasv2-dsvm-pool from old job gate-neutron-lbaasv2-dsvm-pool-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export PROJECTS="openstack/octavia $PROJECTS"
-
-          function gate_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 pool
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 pool
-          }
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api-namespace/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api-namespace/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api-namespace/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/neutron-lbaasv2-dsvm-py3x-api-namespace/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api-namespace/run.yaml
deleted file mode 100644
index 9a2fa968..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api-namespace/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-neutron-lbaasv2-dsvm-py3x-api-namespace from old
-    job gate-neutron-lbaasv2-dsvm-py3x-api-namespace-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export DEVSTACK_GATE_USE_PYTHON3=True
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export PROJECTS="openstack/octavia $PROJECTS"
-
-          function gate_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 api-namespace
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 api-namespace
-          }
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api/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/neutron-lbaasv2-dsvm-py3x-api/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api/run.yaml
deleted file mode 100644
index 97726b09..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api/run.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-neutron-lbaasv2-dsvm-py3x-api from old job gate-neutron-lbaasv2-dsvm-py3x-api-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export DEVSTACK_GATE_USE_PYTHON3=True
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export PROJECTS="openstack/octavia $PROJECTS"
-
-          function gate_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 api
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 api
-          }
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario-namespace/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario-namespace/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario-namespace/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/neutron-lbaasv2-dsvm-py3x-scenario-namespace/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario-namespace/run.yaml
deleted file mode 100644
index 8d715e5e..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario-namespace/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-neutron-lbaasv2-dsvm-py3x-scenario-namespace from
-    old job gate-neutron-lbaasv2-dsvm-py3x-scenario-namespace-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export DEVSTACK_GATE_USE_PYTHON3=True
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export PROJECTS="openstack/octavia $PROJECTS"
-
-          function gate_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 scenario-namespace
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 scenario-namespace
-          }
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario/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/neutron-lbaasv2-dsvm-py3x-scenario/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario/run.yaml
deleted file mode 100644
index d3e661a5..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario/run.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-neutron-lbaasv2-dsvm-py3x-scenario from old job gate-neutron-lbaasv2-dsvm-py3x-scenario-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export DEVSTACK_GATE_USE_PYTHON3=True
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export PROJECTS="openstack/octavia $PROJECTS"
-
-          function gate_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 scenario
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 scenario
-          }
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-scenario-namespace/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-scenario-namespace/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-scenario-namespace/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/neutron-lbaasv2-dsvm-scenario-namespace/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-scenario-namespace/run.yaml
deleted file mode 100644
index 20887275..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-scenario-namespace/run.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-neutron-lbaasv2-dsvm-scenario-namespace from old
-    job gate-neutron-lbaasv2-dsvm-scenario-namespace-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export PROJECTS="openstack/octavia $PROJECTS"
-
-          function gate_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 scenario-namespace
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 scenario-namespace
-          }
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/neutron-lbaasv2-dsvm-scenario/post.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-scenario/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-scenario/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/neutron-lbaasv2-dsvm-scenario/run.yaml b/playbooks/legacy/neutron-lbaasv2-dsvm-scenario/run.yaml
deleted file mode 100644
index 35064e20..00000000
--- a/playbooks/legacy/neutron-lbaasv2-dsvm-scenario/run.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-neutron-lbaasv2-dsvm-scenario from old job gate-neutron-lbaasv2-dsvm-scenario-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TEMPEST=1
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          export PROJECTS="openstack/barbican $PROJECTS"
-          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
-          export PROJECTS="openstack/diskimage-builder $PROJECTS"
-          export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
-          export PROJECTS="openstack/neutron-lbaas $PROJECTS"
-          export PROJECTS="openstack/octavia $PROJECTS"
-
-          function gate_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/gate_hook.sh tempest lbaasv2 scenario
-          }
-          export -f gate_hook
-
-          function post_test_hook {
-              $BASE/new/neutron-lbaas/neutron_lbaas/tests/contrib/post_test_hook.sh tempest lbaasv2 scenario
-          }
-          export -f post_test_hook
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/zuul-legacy-jobs.yaml b/zuul.d/zuul-legacy-jobs.yaml
index 8a0e6424..0d8cd566 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -3827,230 +3827,6 @@
     required-projects:
       - openstack/horizon
 
-- job:
-    name: legacy-neutron-lbaasv2-dsvm-api
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/neutron-lbaasv2-dsvm-api/run
-    post-run: playbooks/legacy/neutron-lbaasv2-dsvm-api/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/tripleo-image-elements
-
-- job:
-    name: legacy-neutron-lbaasv2-dsvm-api-namespace
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/neutron-lbaasv2-dsvm-api-namespace/run
-    post-run: playbooks/legacy/neutron-lbaasv2-dsvm-api-namespace/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/tripleo-image-elements
-
-- job:
-    name: legacy-neutron-lbaasv2-dsvm-healthmonitor
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/neutron-lbaasv2-dsvm-healthmonitor/run
-    post-run: playbooks/legacy/neutron-lbaasv2-dsvm-healthmonitor/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/tripleo-image-elements
-
-- job:
-    name: legacy-neutron-lbaasv2-dsvm-listener
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/neutron-lbaasv2-dsvm-listener/run
-    post-run: playbooks/legacy/neutron-lbaasv2-dsvm-listener/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/tripleo-image-elements
-
-- job:
-    name: legacy-neutron-lbaasv2-dsvm-loadbalancer
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/neutron-lbaasv2-dsvm-loadbalancer/run
-    post-run: playbooks/legacy/neutron-lbaasv2-dsvm-loadbalancer/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/tripleo-image-elements
-
-- job:
-    name: legacy-neutron-lbaasv2-dsvm-member
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/neutron-lbaasv2-dsvm-member/run
-    post-run: playbooks/legacy/neutron-lbaasv2-dsvm-member/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/tripleo-image-elements
-
-- job:
-    name: legacy-neutron-lbaasv2-dsvm-minimal
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/neutron-lbaasv2-dsvm-minimal/run
-    post-run: playbooks/legacy/neutron-lbaasv2-dsvm-minimal/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/tripleo-image-elements
-
-- job:
-    name: legacy-neutron-lbaasv2-dsvm-pool
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/neutron-lbaasv2-dsvm-pool/run
-    post-run: playbooks/legacy/neutron-lbaasv2-dsvm-pool/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/tripleo-image-elements
-
-- job:
-    name: legacy-neutron-lbaasv2-dsvm-py3x-api
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api/run
-    post-run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/tripleo-image-elements
-
-- job:
-    name: legacy-neutron-lbaasv2-dsvm-py3x-api-namespace
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api-namespace/run
-    post-run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-api-namespace/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/tripleo-image-elements
-
-- job:
-    name: legacy-neutron-lbaasv2-dsvm-py3x-scenario
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario/run
-    post-run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/tripleo-image-elements
-
-- job:
-    name: legacy-neutron-lbaasv2-dsvm-py3x-scenario-namespace
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario-namespace/run
-    post-run: playbooks/legacy/neutron-lbaasv2-dsvm-py3x-scenario-namespace/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/tripleo-image-elements
-
-- job:
-    name: legacy-neutron-lbaasv2-dsvm-scenario
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/neutron-lbaasv2-dsvm-scenario/run
-    post-run: playbooks/legacy/neutron-lbaasv2-dsvm-scenario/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/tripleo-image-elements
-
-- job:
-    name: legacy-neutron-lbaasv2-dsvm-scenario-namespace
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/neutron-lbaasv2-dsvm-scenario-namespace/run
-    post-run: playbooks/legacy/neutron-lbaasv2-dsvm-scenario-namespace/post
-    timeout: 7800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/barbican
-      - openstack/diskimage-builder
-      - openstack/neutron
-      - openstack/neutron-lbaas
-      - openstack/octavia
-      - openstack/python-barbicanclient
-      - openstack/tripleo-image-elements
-
 - job:
     name: legacy-neutron-vpnaas-dsvm-functional-sswan
     parent: legacy-dsvm-base