diff --git a/playbooks/legacy/keystone-dsvm-functional-v3-only/post.yaml b/playbooks/legacy/keystone-dsvm-functional-v3-only/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/keystone-dsvm-functional-v3-only/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/keystone-dsvm-functional-v3-only/run.yaml b/playbooks/legacy/keystone-dsvm-functional-v3-only/run.yaml
deleted file mode 100644
index ddc326c4..00000000
--- a/playbooks/legacy/keystone-dsvm-functional-v3-only/run.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-keystone-dsvm-functional-v3-only from old job gate-keystone-dsvm-functional-v3-only-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          TEMPEST_PLUGINS='/opt/stack/new/keystone-tempest-plugin'
-          ENABLE_IDENTITY_V2=False
-          enable_plugin keystone git://git.openstack.org/openstack/keystone
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export PROJECTS="openstack/keystone-tempest-plugin $PROJECTS"
-          export DEVSTACK_GATE_TEMPEST=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          export DEVSTACK_GATE_TEMPEST_REGEX='keystone_tempest_plugin'
-          export ENABLED_SERVICES=keystone-saml2-federation
-
-          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/keystone-dsvm-functional/post.yaml b/playbooks/legacy/keystone-dsvm-functional/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/keystone-dsvm-functional/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/keystone-dsvm-functional/run.yaml b/playbooks/legacy/keystone-dsvm-functional/run.yaml
deleted file mode 100644
index ece1094e..00000000
--- a/playbooks/legacy/keystone-dsvm-functional/run.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-keystone-dsvm-functional from old job gate-keystone-dsvm-functional-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          TEMPEST_PLUGINS='/opt/stack/new/keystone-tempest-plugin'
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export PROJECTS="openstack/keystone-tempest-plugin $PROJECTS"
-          export DEVSTACK_GATE_TEMPEST=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          export DEVSTACK_GATE_TEMPEST_REGEX='keystone_tempest_plugin'
-
-          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/keystone-dsvm-py35-functional-v3-only/post.yaml b/playbooks/legacy/keystone-dsvm-py35-functional-v3-only/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/keystone-dsvm-py35-functional-v3-only/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/keystone-dsvm-py35-functional-v3-only/run.yaml b/playbooks/legacy/keystone-dsvm-py35-functional-v3-only/run.yaml
deleted file mode 100644
index 0aa9faeb..00000000
--- a/playbooks/legacy/keystone-dsvm-py35-functional-v3-only/run.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-keystone-dsvm-py35-functional-v3-only from old job
-    gate-keystone-dsvm-py35-functional-v3-only-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          TEMPEST_PLUGINS='/opt/stack/new/keystone-tempest-plugin'
-          # swift is not ready for python3 yet
-          disable_service s-account
-          disable_service s-container
-          disable_service s-object
-          disable_service s-proxy
-          ENABLE_IDENTITY_V2=False
-          enable_plugin keystone git://git.openstack.org/openstack/keystone
-
-          EOF
-        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 PROJECTS="openstack/keystone-tempest-plugin $PROJECTS"
-          export DEVSTACK_GATE_TEMPEST=1
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          export DEVSTACK_GATE_TEMPEST_REGEX='keystone_tempest_plugin'
-          export ENABLED_SERVICES=keystone-saml2-federation
-
-          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/swift-dsvm-functional-identity-v3-only/post.yaml b/playbooks/legacy/swift-dsvm-functional-identity-v3-only/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/swift-dsvm-functional-identity-v3-only/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/swift-dsvm-functional-identity-v3-only/run.yaml b/playbooks/legacy/swift-dsvm-functional-identity-v3-only/run.yaml
deleted file mode 100644
index 972a6410..00000000
--- a/playbooks/legacy/swift-dsvm-functional-identity-v3-only/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-swift-dsvm-functional-identity-v3-only from old job
-    gate-swift-dsvm-functional-identity-v3-only-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export FUNCTEST_TIMEOUT=30
-          # Disable all services
-          export DEVSTACK_GATE_NO_SERVICES=1
-          # Add only what we want, keystone + swift
-          export DEVSTACK_GATE_SWIFT=1
-          export DEVSTACK_GATE_KEYSTONE=1
-          # Need to override default which is neutron enabled
-          export DEVSTACK_GATE_NEUTRON=0
-          export DEVSTACK_GATE_TEMPEST=0
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          if [ "-identity-v3-only" == "-identity-v3-only" ] ; then
-              export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
-          fi
-
-          function post_test_hook {
-              cd /opt/stack/new/swift
-              # Launch V2 auth tests and v1 tests after.
-              sudo -H -u stack timeout -s 9 ${FUNCTEST_TIMEOUT}m tox -e func && \
-                  sudo -H -u stack SWIFT_TEST_CONFIG_FILE=/opt/stack/new/swift/test/sample.conf \
-                      timeout -s 9 ${FUNCTEST_TIMEOUT}m tox -e func
-          }
-          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/swift-dsvm-functional/post.yaml b/playbooks/legacy/swift-dsvm-functional/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/swift-dsvm-functional/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/swift-dsvm-functional/run.yaml b/playbooks/legacy/swift-dsvm-functional/run.yaml
deleted file mode 100644
index b78c51ca..00000000
--- a/playbooks/legacy/swift-dsvm-functional/run.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-swift-dsvm-functional from old job gate-swift-dsvm-functional-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export FUNCTEST_TIMEOUT=30
-          # Disable all services
-          export DEVSTACK_GATE_NO_SERVICES=1
-          # Add only what we want, keystone + swift
-          export DEVSTACK_GATE_SWIFT=1
-          export DEVSTACK_GATE_KEYSTONE=1
-          # Need to override default which is neutron enabled
-          export DEVSTACK_GATE_NEUTRON=0
-          export DEVSTACK_GATE_TEMPEST=0
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          if [ "" == "-identity-v3-only" ] ; then
-              export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
-          fi
-
-          function post_test_hook {
-              cd /opt/stack/new/swift
-              # Launch V2 auth tests and v1 tests after.
-              sudo -H -u stack timeout -s 9 ${FUNCTEST_TIMEOUT}m tox -e func && \
-                  sudo -H -u stack SWIFT_TEST_CONFIG_FILE=/opt/stack/new/swift/test/sample.conf \
-                      timeout -s 9 ${FUNCTEST_TIMEOUT}m tox -e func
-          }
-          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/swiftclient-dsvm-functional-identity-v3-only/post.yaml b/playbooks/legacy/swiftclient-dsvm-functional-identity-v3-only/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/swiftclient-dsvm-functional-identity-v3-only/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/swiftclient-dsvm-functional-identity-v3-only/run.yaml b/playbooks/legacy/swiftclient-dsvm-functional-identity-v3-only/run.yaml
deleted file mode 100644
index a90c27d8..00000000
--- a/playbooks/legacy/swiftclient-dsvm-functional-identity-v3-only/run.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-swiftclient-dsvm-functional-identity-v3-only from
-    old job gate-swiftclient-dsvm-functional-identity-v3-only-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export FUNCTEST_TIMEOUT=30
-          # Disable all services
-          export DEVSTACK_GATE_NO_SERVICES=1
-          # Add only what we want, keystone + swift
-          export DEVSTACK_GATE_SWIFT=1
-          export DEVSTACK_GATE_KEYSTONE=1
-          # Need to override default which is neutron enabled
-          export DEVSTACK_GATE_NEUTRON=0
-          export DEVSTACK_GATE_TEMPEST=0
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          export DEVSTACK_PROJECT_FROM_GIT=python-swiftclient
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          if [ "-identity-v3-only" == "-identity-v3-only" ] ; then
-              export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
-          fi
-
-          function post_test_hook {
-              cd /opt/stack/new/python-swiftclient
-              # Launch V2 auth tests and v1 tests after.
-              sudo -H -u stack timeout -s 9 ${FUNCTEST_TIMEOUT}m tox -e func && \
-                  sudo -H -u stack SWIFT_TEST_CONFIG_FILE=/opt/stack/new/swift/test/sample.conf \
-                      timeout -s 9 ${FUNCTEST_TIMEOUT}m tox -e func
-          }
-          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/swiftclient-dsvm-functional/post.yaml b/playbooks/legacy/swiftclient-dsvm-functional/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/swiftclient-dsvm-functional/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/swiftclient-dsvm-functional/run.yaml b/playbooks/legacy/swiftclient-dsvm-functional/run.yaml
deleted file mode 100644
index b3060e1a..00000000
--- a/playbooks/legacy/swiftclient-dsvm-functional/run.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-swiftclient-dsvm-functional from old job gate-swiftclient-dsvm-functional-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 FUNCTEST_TIMEOUT=30
-          # Disable all services
-          export DEVSTACK_GATE_NO_SERVICES=1
-          # Add only what we want, keystone + swift
-          export DEVSTACK_GATE_SWIFT=1
-          export DEVSTACK_GATE_KEYSTONE=1
-          # Need to override default which is neutron enabled
-          export DEVSTACK_GATE_NEUTRON=0
-          export DEVSTACK_GATE_TEMPEST=0
-          export DEVSTACK_GATE_EXERCISES=0
-          export DEVSTACK_GATE_INSTALL_TESTONLY=1
-          export BRANCH_OVERRIDE=default
-          export DEVSTACK_PROJECT_FROM_GIT=python-swiftclient
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-          if [ "" == "-identity-v3-only" ] ; then
-              export DEVSTACK_LOCAL_CONFIG="ENABLE_IDENTITY_V2=False"
-          fi
-
-          function post_test_hook {
-              cd /opt/stack/new/python-swiftclient
-              # Launch V2 auth tests and v1 tests after.
-              sudo -H -u stack timeout -s 9 ${FUNCTEST_TIMEOUT}m tox -e func && \
-                  sudo -H -u stack SWIFT_TEST_CONFIG_FILE=/opt/stack/new/swift/test/sample.conf \
-                      timeout -s 9 ${FUNCTEST_TIMEOUT}m tox -e func
-          }
-          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 87817d05..438145a6 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -398,39 +398,6 @@
     run: playbooks/legacy/js-openstack-lib-nodejs6-npm-sdk-docs/run.yaml
     timeout: 1800
 
-- job:
-    name: legacy-keystone-dsvm-functional
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/keystone-dsvm-functional/run.yaml
-    post-run: playbooks/legacy/keystone-dsvm-functional/post.yaml
-    timeout: 4200
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/keystone
-      - openstack/keystone-tempest-plugin
-
-- job:
-    name: legacy-keystone-dsvm-functional-v3-only
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/keystone-dsvm-functional-v3-only/run.yaml
-    post-run: playbooks/legacy/keystone-dsvm-functional-v3-only/post.yaml
-    timeout: 4200
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/keystone
-      - openstack/keystone-tempest-plugin
-
-- job:
-    name: legacy-keystone-dsvm-py35-functional-v3-only
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/keystone-dsvm-py35-functional-v3-only/run.yaml
-    post-run: playbooks/legacy/keystone-dsvm-py35-functional-v3-only/post.yaml
-    timeout: 4200
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/keystone
-      - openstack/keystone-tempest-plugin
-
 - job:
     name: legacy-keystoneclient-dsvm-functional
     parent: legacy-dsvm-base
@@ -1421,48 +1388,6 @@
     timeout: 2400
     nodeset: legacy-ubuntu-trusty
 
-- job:
-    name: legacy-swift-dsvm-functional
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/swift-dsvm-functional/run.yaml
-    post-run: playbooks/legacy/swift-dsvm-functional/post.yaml
-    timeout: 6000
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/swift
-
-- job:
-    name: legacy-swift-dsvm-functional-identity-v3-only
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/swift-dsvm-functional-identity-v3-only/run.yaml
-    post-run: playbooks/legacy/swift-dsvm-functional-identity-v3-only/post.yaml
-    timeout: 6000
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/swift
-
-- job:
-    name: legacy-swiftclient-dsvm-functional
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/swiftclient-dsvm-functional/run.yaml
-    post-run: playbooks/legacy/swiftclient-dsvm-functional/post.yaml
-    timeout: 6000
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/python-swiftclient
-      - openstack/swift
-
-- job:
-    name: legacy-swiftclient-dsvm-functional-identity-v3-only
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/swiftclient-dsvm-functional-identity-v3-only/run.yaml
-    post-run: playbooks/legacy/swiftclient-dsvm-functional-identity-v3-only/post.yaml
-    timeout: 6000
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/python-swiftclient
-      - openstack/swift
-
 - job:
     name: legacy-system-config-puppet-syntax-3
     parent: legacy-base