From 012f1a4c52fc30ad0e066a52a743cefa64f2788e Mon Sep 17 00:00:00 2001
From: Raissa Sarmento <rdearauj@redhat.com>
Date: Wed, 18 Oct 2017 15:29:27 +0100
Subject: [PATCH] Remove manila legacy jobs

Part of the steps towards moving manila
legacy jobs to manila's repository.

Depends-On: Ib723415950cfc618f6b533383e824422121c70b5
Change-Id: Id90fbcbb967ec8d520c369e5ba7482e17beb28a1
---
 .../legacy/grenade-dsvm-manila/post.yaml      |  15 -
 playbooks/legacy/grenade-dsvm-manila/run.yaml |  65 ----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  | 108 -------
 .../post.yaml                                 |  15 -
 .../run.yaml                                  | 108 -------
 .../post.yaml                                 |  15 -
 .../run.yaml                                  | 108 -------
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  77 -----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  77 -----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  77 -----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  76 -----
 .../legacy/manila-tempest-dsvm-hdfs/post.yaml |  15 -
 .../legacy/manila-tempest-dsvm-hdfs/run.yaml  |  70 -----
 .../post.yaml                                 |  15 -
 .../run.yaml                                  | 107 -------
 .../post.yaml                                 |  15 -
 .../run.yaml                                  | 108 -------
 .../post.yaml                                 |  15 -
 .../run.yaml                                  | 108 -------
 .../post.yaml                                 |  15 -
 .../run.yaml                                  | 108 -------
 .../manila-tempest-dsvm-scenario/post.yaml    |  15 -
 .../manila-tempest-dsvm-scenario/run.yaml     | 107 -------
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  94 ------
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  94 ------
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  94 ------
 .../post.yaml                                 |  15 -
 .../run.yaml                                  |  95 ------
 .../post.yaml                                 |  15 -
 .../run.yaml                                  | 101 ------
 .../post.yaml                                 |  15 -
 .../run.yaml                                  | 101 ------
 .../legacy/manila-tox-genconfig/post.yaml     |  67 ----
 .../legacy/manila-tox-genconfig/run.yaml      |  86 -----
 .../post.yaml                                 |  41 ---
 .../run.yaml                                  |  86 -----
 .../rally-dsvm-manila-multibackend/post.yaml  |  41 ---
 .../rally-dsvm-manila-multibackend/run.yaml   |  85 -----
 zuul.d/zuul-legacy-jobs.yaml                  | 295 ------------------
 47 files changed, 2884 deletions(-)
 delete mode 100644 playbooks/legacy/grenade-dsvm-manila/post.yaml
 delete mode 100644 playbooks/legacy/grenade-dsvm-manila/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/post.yaml
 delete mode 100644 playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml
 delete mode 100644 playbooks/legacy/manila-tox-genconfig/post.yaml
 delete mode 100644 playbooks/legacy/manila-tox-genconfig/run.yaml
 delete mode 100644 playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml
 delete mode 100644 playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/run.yaml
 delete mode 100644 playbooks/legacy/rally-dsvm-manila-multibackend/post.yaml
 delete mode 100644 playbooks/legacy/rally-dsvm-manila-multibackend/run.yaml

diff --git a/playbooks/legacy/grenade-dsvm-manila/post.yaml b/playbooks/legacy/grenade-dsvm-manila/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/grenade-dsvm-manila/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/grenade-dsvm-manila/run.yaml b/playbooks/legacy/grenade-dsvm-manila/run.yaml
deleted file mode 100644
index 8a7a812b..00000000
--- a/playbooks/legacy/grenade-dsvm-manila/run.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-grenade-dsvm-manila from old job gate-grenade-dsvm-manila-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 PROJECTS="openstack-dev/grenade $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_NEUTRON=0
-          export DEVSTACK_GATE_TEMPEST_NOTESTS=1
-          export DEVSTACK_GATE_GRENADE=pullup
-
-          # Basic services needed for grenade manila job using dummy driver
-          export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit
-
-          # Enable manila grenade plugin. Provided repo should be
-          # cloned by zuul before devstack run and below provided
-          # link should not be used.
-          export GRENADE_PLUGINRC="enable_grenade_plugin manila git://git.openstack.org/openstack/manila"
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              source $BASE/new/manila/contrib/ci/pre_test_hook.sh \
-                  True \
-                  dummy \
-                  multibackend
-          }
-          export -f pre_test_hook
-
-          export BRANCH_OVERRIDE=default
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-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/manila-tempest-dsvm-container-scenario-custom-image/run.yaml b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml
deleted file mode 100644
index 7d5d7978..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-dsvm-container-scenario-custom-image
-    from old job gate-manila-tempest-dsvm-container-scenario-custom-image-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-
-          EOF
-        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_NEUTRON=1
-          export DEVSTACK_GATE_POSTGRES=0
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-
-          # Install manila-image-elements project for building custom image
-          if [[ container_with_custom_image == *"_with_custom_image" ]]; then
-              export PROJECTS="openstack/manila-image-elements $PROJECTS"
-          fi
-          export ENABLED_SERVICES=tempest
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Build custom image if needed
-              if [[ container_with_custom_image == *"_with_custom_image" ]]; then
-                  current_dir=$(pwd)
-
-                  # Go to 'manila-image-elements' dir, build image and get its name
-                  cd /opt/stack/new/manila-image-elements
-                  ./tools/gate/build-images container_with_custom_image True
-                  image_name=$(git ls-files --others --exclude-standard)
-                  export MANILA_SERVICE_IMAGE_URL="http://localhost:80/public_html/$image_name"
-                  export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
-
-                  # Return back to execution dir
-                  cd $current_dir
-              fi
-
-              # 'dhss' - acronym for 'Driver Handles Share Servers',
-              # defines mode of a share driver. Boolean-like.
-              # 'driver' - codename of a share driver to configure.
-              # 'back_end_type' - defines which installation Manila should
-              # have - either 'singlebackend' or 'multibackend'.
-              source $BASE/new/manila/contrib/ci/pre_test_hook.sh \
-                  1 \
-                  container_with_custom_image \
-                  multibackend
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # 'back_end_type' - defines which installation Manila is
-              # configured to - either 'singlebackend' or 'multibackend'.
-              # 'driver' - codename of a share driver that is configured in
-              # Manila. It is used for enabling/disabling tests that are not
-              # supported by share driver that is used.
-              # 'test_type' - defines which set of test suites should be used,
-              # can have 'api' and 'scenario' values.
-              # 'postgres_enabled' - set of test suites depends on DB backend
-              # in some cases, so it is provided explicitely. Boolean-like.
-              source $BASE/new/manila/contrib/ci/post_test_hook.sh \
-                  multibackend \
-                  container_with_custom_image \
-                  scenario \
-                  0
-          }
-          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/manila-tempest-dsvm-generic-no-share-servers/post.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/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/manila-tempest-dsvm-generic-no-share-servers/run.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
deleted file mode 100644
index 28ec9045..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-dsvm-generic-no-share-servers from
-    old job gate-manila-tempest-dsvm-generic-no-share-servers-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-
-          EOF
-        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_NEUTRON=1
-          export DEVSTACK_GATE_POSTGRES=0
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-
-          # Install manila-image-elements project for building custom image
-          if [[ generic == *"_with_custom_image" ]]; then
-              export PROJECTS="openstack/manila-image-elements $PROJECTS"
-          fi
-          export ENABLED_SERVICES=tempest
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Build custom image if needed
-              if [[ generic == *"_with_custom_image" ]]; then
-                  current_dir=$(pwd)
-
-                  # Go to 'manila-image-elements' dir, build image and get its name
-                  cd /opt/stack/new/manila-image-elements
-                  ./tools/gate/build-images generic True
-                  image_name=$(git ls-files --others --exclude-standard)
-                  export MANILA_SERVICE_IMAGE_URL="http://localhost:80/public_html/$image_name"
-                  export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
-
-                  # Return back to execution dir
-                  cd $current_dir
-              fi
-
-              # 'dhss' - acronym for 'Driver Handles Share Servers',
-              # defines mode of a share driver. Boolean-like.
-              # 'driver' - codename of a share driver to configure.
-              # 'back_end_type' - defines which installation Manila should
-              # have - either 'singlebackend' or 'multibackend'.
-              source $BASE/new/manila/contrib/ci/pre_test_hook.sh \
-                  0 \
-                  generic \
-                  multibackend
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # 'back_end_type' - defines which installation Manila is
-              # configured to - either 'singlebackend' or 'multibackend'.
-              # 'driver' - codename of a share driver that is configured in
-              # Manila. It is used for enabling/disabling tests that are not
-              # supported by share driver that is used.
-              # 'test_type' - defines which set of test suites should be used,
-              # can have 'api' and 'scenario' values.
-              # 'postgres_enabled' - set of test suites depends on DB backend
-              # in some cases, so it is provided explicitely. Boolean-like.
-              source $BASE/new/manila/contrib/ci/post_test_hook.sh \
-                  multibackend \
-                  generic \
-                  api \
-                  0
-          }
-          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/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-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/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml
deleted file mode 100644
index daa49cee..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-dsvm-generic-scenario-custom-image
-    from old job gate-manila-tempest-dsvm-generic-scenario-custom-image-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-
-          EOF
-        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_NEUTRON=1
-          export DEVSTACK_GATE_POSTGRES=0
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-
-          # Install manila-image-elements project for building custom image
-          if [[ generic_with_custom_image == *"_with_custom_image" ]]; then
-              export PROJECTS="openstack/manila-image-elements $PROJECTS"
-          fi
-          export ENABLED_SERVICES=tempest
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Build custom image if needed
-              if [[ generic_with_custom_image == *"_with_custom_image" ]]; then
-                  current_dir=$(pwd)
-
-                  # Go to 'manila-image-elements' dir, build image and get its name
-                  cd /opt/stack/new/manila-image-elements
-                  ./tools/gate/build-images generic_with_custom_image True
-                  image_name=$(git ls-files --others --exclude-standard)
-                  export MANILA_SERVICE_IMAGE_URL="http://localhost:80/public_html/$image_name"
-                  export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
-
-                  # Return back to execution dir
-                  cd $current_dir
-              fi
-
-              # 'dhss' - acronym for 'Driver Handles Share Servers',
-              # defines mode of a share driver. Boolean-like.
-              # 'driver' - codename of a share driver to configure.
-              # 'back_end_type' - defines which installation Manila should
-              # have - either 'singlebackend' or 'multibackend'.
-              source $BASE/new/manila/contrib/ci/pre_test_hook.sh \
-                  1 \
-                  generic_with_custom_image \
-                  multibackend
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # 'back_end_type' - defines which installation Manila is
-              # configured to - either 'singlebackend' or 'multibackend'.
-              # 'driver' - codename of a share driver that is configured in
-              # Manila. It is used for enabling/disabling tests that are not
-              # supported by share driver that is used.
-              # 'test_type' - defines which set of test suites should be used,
-              # can have 'api' and 'scenario' values.
-              # 'postgres_enabled' - set of test suites depends on DB backend
-              # in some cases, so it is provided explicitely. Boolean-like.
-              source $BASE/new/manila/contrib/ci/post_test_hook.sh \
-                  multibackend \
-                  generic_with_custom_image \
-                  scenario \
-                  0
-          }
-          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/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/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/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml
deleted file mode 100644
index b905cf9b..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-dsvm-glusterfs-native-heketi from
-    old job gate-manila-tempest-dsvm-glusterfs-native-heketi-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-          # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
-          enable_plugin devstack-plugin-glusterfs git://git.openstack.org/openstack/devstack-plugin-glusterfs
-
-          # Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila.
-          CONFIGURE_GLUSTERFS_MANILA=True
-
-          # Configure devstack-plugin-glusterfs to use respective GlusterFS driver variant.
-          GLUSTERFS_MANILA_DRIVER_TYPE=glusterfs-native-heketi
-
-          EOF
-        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_NEUTRON=1
-          export ENABLED_SERVICES=tempest
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-          export PROJECTS="openstack/devstack-plugin-glusterfs $PROJECTS"
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Configure devstack to run manila installation without handling of share servers
-              source $BASE/new/devstack-plugin-glusterfs/manila/pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # Configure and run tempest on singlebackend manila installation
-              source $BASE/new/devstack-plugin-glusterfs/manila/post_test_hook.sh singlebackend
-          }
-          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/manila-tempest-dsvm-glusterfs-native/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/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/manila-tempest-dsvm-glusterfs-native/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml
deleted file mode 100644
index 87d004ec..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-dsvm-glusterfs-native from old job
-    gate-manila-tempest-dsvm-glusterfs-native-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-          # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
-          enable_plugin devstack-plugin-glusterfs git://git.openstack.org/openstack/devstack-plugin-glusterfs
-
-          # Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila.
-          CONFIGURE_GLUSTERFS_MANILA=True
-
-          # Configure devstack-plugin-glusterfs to use respective GlusterFS driver variant.
-          GLUSTERFS_MANILA_DRIVER_TYPE=glusterfs-native
-
-          EOF
-        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_NEUTRON=1
-          export ENABLED_SERVICES=tempest
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-          export PROJECTS="openstack/devstack-plugin-glusterfs $PROJECTS"
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Configure devstack to run manila installation without handling of share servers
-              source $BASE/new/devstack-plugin-glusterfs/manila/pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # Configure and run tempest on singlebackend manila installation
-              source $BASE/new/devstack-plugin-glusterfs/manila/post_test_hook.sh singlebackend
-          }
-          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/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/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/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml
deleted file mode 100644
index 09e269c2..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-dsvm-glusterfs-nfs-heketi from old
-    job gate-manila-tempest-dsvm-glusterfs-nfs-heketi-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-          # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
-          enable_plugin devstack-plugin-glusterfs git://git.openstack.org/openstack/devstack-plugin-glusterfs
-
-          # Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila.
-          CONFIGURE_GLUSTERFS_MANILA=True
-
-          # Configure devstack-plugin-glusterfs to use respective GlusterFS driver variant.
-          GLUSTERFS_MANILA_DRIVER_TYPE=glusterfs-nfs-heketi
-
-          EOF
-        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_NEUTRON=1
-          export ENABLED_SERVICES=tempest
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-          export PROJECTS="openstack/devstack-plugin-glusterfs $PROJECTS"
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Configure devstack to run manila installation without handling of share servers
-              source $BASE/new/devstack-plugin-glusterfs/manila/pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # Configure and run tempest on singlebackend manila installation
-              source $BASE/new/devstack-plugin-glusterfs/manila/post_test_hook.sh singlebackend
-          }
-          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/manila-tempest-dsvm-glusterfs-nfs/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/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/manila-tempest-dsvm-glusterfs-nfs/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml
deleted file mode 100644
index fc39c868..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-dsvm-glusterfs-nfs from old job gate-manila-tempest-dsvm-glusterfs-nfs-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-          # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
-          enable_plugin devstack-plugin-glusterfs git://git.openstack.org/openstack/devstack-plugin-glusterfs
-
-          # Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila.
-          CONFIGURE_GLUSTERFS_MANILA=True
-
-          # Configure devstack-plugin-glusterfs to use respective GlusterFS driver variant.
-          GLUSTERFS_MANILA_DRIVER_TYPE=glusterfs-nfs
-
-          EOF
-        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_NEUTRON=1
-          export ENABLED_SERVICES=tempest
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-          export PROJECTS="openstack/devstack-plugin-glusterfs $PROJECTS"
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Configure devstack to run manila installation without handling of share servers
-              source $BASE/new/devstack-plugin-glusterfs/manila/pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # Configure and run tempest on singlebackend manila installation
-              source $BASE/new/devstack-plugin-glusterfs/manila/post_test_hook.sh singlebackend
-          }
-          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/manila-tempest-dsvm-hdfs/post.yaml b/playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-hdfs/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/manila-tempest-dsvm-hdfs/run.yaml b/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml
deleted file mode 100644
index 20524053..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-dsvm-hdfs from old job gate-manila-tempest-dsvm-hdfs-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-          # Enable devstack-plugin-hdfs plugin, to install and configure HDFS.
-          enable_plugin devstack-plugin-hdfs git://git.openstack.org/openstack/devstack-plugin-hdfs
-
-          EOF
-        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_NEUTRON=1
-          export ENABLED_SERVICES=tempest
-          export PROJECTS="openstack/devstack-plugin-hdfs $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Configure devstack to run manila installation without handling of share servers
-              source $BASE/new/devstack-plugin-hdfs/manila/pre_test_hook.sh
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # Configure and run tempest on multi-backend manila installation
-              source $BASE/new/devstack-plugin-hdfs/manila/post_test_hook.sh
-          }
-          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/manila-tempest-dsvm-mysql-generic/post.yaml b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/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/manila-tempest-dsvm-mysql-generic/run.yaml b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
deleted file mode 100644
index 83de354d..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-dsvm-mysql-generic from old job gate-manila-tempest-dsvm-mysql-generic-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-
-          EOF
-        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_NEUTRON=1
-          export DEVSTACK_GATE_POSTGRES=0
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-
-          # Install manila-image-elements project for building custom image
-          if [[ generic == *"_with_custom_image" ]]; then
-              export PROJECTS="openstack/manila-image-elements $PROJECTS"
-          fi
-          export ENABLED_SERVICES=tempest
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Build custom image if needed
-              if [[ generic == *"_with_custom_image" ]]; then
-                  current_dir=$(pwd)
-
-                  # Go to 'manila-image-elements' dir, build image and get its name
-                  cd /opt/stack/new/manila-image-elements
-                  ./tools/gate/build-images generic True
-                  image_name=$(git ls-files --others --exclude-standard)
-                  export MANILA_SERVICE_IMAGE_URL="http://localhost:80/public_html/$image_name"
-                  export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
-
-                  # Return back to execution dir
-                  cd $current_dir
-              fi
-
-              # 'dhss' - acronym for 'Driver Handles Share Servers',
-              # defines mode of a share driver. Boolean-like.
-              # 'driver' - codename of a share driver to configure.
-              # 'back_end_type' - defines which installation Manila should
-              # have - either 'singlebackend' or 'multibackend'.
-              source $BASE/new/manila/contrib/ci/pre_test_hook.sh \
-                  1 \
-                  generic \
-                  multibackend
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # 'back_end_type' - defines which installation Manila is
-              # configured to - either 'singlebackend' or 'multibackend'.
-              # 'driver' - codename of a share driver that is configured in
-              # Manila. It is used for enabling/disabling tests that are not
-              # supported by share driver that is used.
-              # 'test_type' - defines which set of test suites should be used,
-              # can have 'api' and 'scenario' values.
-              # 'postgres_enabled' - set of test suites depends on DB backend
-              # in some cases, so it is provided explicitely. Boolean-like.
-              source $BASE/new/manila/contrib/ci/post_test_hook.sh \
-                  multibackend \
-                  generic \
-                  api \
-                  0
-          }
-          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/manila-tempest-dsvm-postgres-container/post.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-container/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/manila-tempest-dsvm-postgres-container/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
deleted file mode 100644
index eba61e68..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-dsvm-postgres-container from old job
-    gate-manila-tempest-dsvm-postgres-container-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-
-          EOF
-        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_NEUTRON=1
-          export DEVSTACK_GATE_POSTGRES=1
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-
-          # Install manila-image-elements project for building custom image
-          if [[ container == *"_with_custom_image" ]]; then
-              export PROJECTS="openstack/manila-image-elements $PROJECTS"
-          fi
-          export ENABLED_SERVICES=tempest
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Build custom image if needed
-              if [[ container == *"_with_custom_image" ]]; then
-                  current_dir=$(pwd)
-
-                  # Go to 'manila-image-elements' dir, build image and get its name
-                  cd /opt/stack/new/manila-image-elements
-                  ./tools/gate/build-images container True
-                  image_name=$(git ls-files --others --exclude-standard)
-                  export MANILA_SERVICE_IMAGE_URL="http://localhost:80/public_html/$image_name"
-                  export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
-
-                  # Return back to execution dir
-                  cd $current_dir
-              fi
-
-              # 'dhss' - acronym for 'Driver Handles Share Servers',
-              # defines mode of a share driver. Boolean-like.
-              # 'driver' - codename of a share driver to configure.
-              # 'back_end_type' - defines which installation Manila should
-              # have - either 'singlebackend' or 'multibackend'.
-              source $BASE/new/manila/contrib/ci/pre_test_hook.sh \
-                  1 \
-                  container \
-                  multibackend
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # 'back_end_type' - defines which installation Manila is
-              # configured to - either 'singlebackend' or 'multibackend'.
-              # 'driver' - codename of a share driver that is configured in
-              # Manila. It is used for enabling/disabling tests that are not
-              # supported by share driver that is used.
-              # 'test_type' - defines which set of test suites should be used,
-              # can have 'api' and 'scenario' values.
-              # 'postgres_enabled' - set of test suites depends on DB backend
-              # in some cases, so it is provided explicitely. Boolean-like.
-              source $BASE/new/manila/contrib/ci/post_test_hook.sh \
-                  multibackend \
-                  container \
-                  api \
-                  1
-          }
-          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/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/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/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
deleted file mode 100644
index 9310e03f..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-dsvm-postgres-generic-singlebackend
-    from old job gate-manila-tempest-dsvm-postgres-generic-singlebackend-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-
-          EOF
-        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_NEUTRON=1
-          export DEVSTACK_GATE_POSTGRES=1
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-
-          # Install manila-image-elements project for building custom image
-          if [[ generic == *"_with_custom_image" ]]; then
-              export PROJECTS="openstack/manila-image-elements $PROJECTS"
-          fi
-          export ENABLED_SERVICES=tempest
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Build custom image if needed
-              if [[ generic == *"_with_custom_image" ]]; then
-                  current_dir=$(pwd)
-
-                  # Go to 'manila-image-elements' dir, build image and get its name
-                  cd /opt/stack/new/manila-image-elements
-                  ./tools/gate/build-images generic True
-                  image_name=$(git ls-files --others --exclude-standard)
-                  export MANILA_SERVICE_IMAGE_URL="http://localhost:80/public_html/$image_name"
-                  export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
-
-                  # Return back to execution dir
-                  cd $current_dir
-              fi
-
-              # 'dhss' - acronym for 'Driver Handles Share Servers',
-              # defines mode of a share driver. Boolean-like.
-              # 'driver' - codename of a share driver to configure.
-              # 'back_end_type' - defines which installation Manila should
-              # have - either 'singlebackend' or 'multibackend'.
-              source $BASE/new/manila/contrib/ci/pre_test_hook.sh \
-                  1 \
-                  generic \
-                  singlebackend
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # 'back_end_type' - defines which installation Manila is
-              # configured to - either 'singlebackend' or 'multibackend'.
-              # 'driver' - codename of a share driver that is configured in
-              # Manila. It is used for enabling/disabling tests that are not
-              # supported by share driver that is used.
-              # 'test_type' - defines which set of test suites should be used,
-              # can have 'api' and 'scenario' values.
-              # 'postgres_enabled' - set of test suites depends on DB backend
-              # in some cases, so it is provided explicitely. Boolean-like.
-              source $BASE/new/manila/contrib/ci/post_test_hook.sh \
-                  singlebackend \
-                  generic \
-                  api \
-                  1
-          }
-          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/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/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/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
deleted file mode 100644
index c9f6c12e..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-dsvm-postgres-zfsonlinux from old
-    job gate-manila-tempest-dsvm-postgres-zfsonlinux-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-
-          EOF
-        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_NEUTRON=1
-          export DEVSTACK_GATE_POSTGRES=1
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-
-          # Install manila-image-elements project for building custom image
-          if [[ zfsonlinux == *"_with_custom_image" ]]; then
-              export PROJECTS="openstack/manila-image-elements $PROJECTS"
-          fi
-          export ENABLED_SERVICES=tempest
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Build custom image if needed
-              if [[ zfsonlinux == *"_with_custom_image" ]]; then
-                  current_dir=$(pwd)
-
-                  # Go to 'manila-image-elements' dir, build image and get its name
-                  cd /opt/stack/new/manila-image-elements
-                  ./tools/gate/build-images zfsonlinux True
-                  image_name=$(git ls-files --others --exclude-standard)
-                  export MANILA_SERVICE_IMAGE_URL="http://localhost:80/public_html/$image_name"
-                  export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
-
-                  # Return back to execution dir
-                  cd $current_dir
-              fi
-
-              # 'dhss' - acronym for 'Driver Handles Share Servers',
-              # defines mode of a share driver. Boolean-like.
-              # 'driver' - codename of a share driver to configure.
-              # 'back_end_type' - defines which installation Manila should
-              # have - either 'singlebackend' or 'multibackend'.
-              source $BASE/new/manila/contrib/ci/pre_test_hook.sh \
-                  0 \
-                  zfsonlinux \
-                  multibackend
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # 'back_end_type' - defines which installation Manila is
-              # configured to - either 'singlebackend' or 'multibackend'.
-              # 'driver' - codename of a share driver that is configured in
-              # Manila. It is used for enabling/disabling tests that are not
-              # supported by share driver that is used.
-              # 'test_type' - defines which set of test suites should be used,
-              # can have 'api' and 'scenario' values.
-              # 'postgres_enabled' - set of test suites depends on DB backend
-              # in some cases, so it is provided explicitely. Boolean-like.
-              source $BASE/new/manila/contrib/ci/post_test_hook.sh \
-                  multibackend \
-                  zfsonlinux \
-                  api \
-                  1
-          }
-          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/manila-tempest-dsvm-scenario/post.yaml b/playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-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/manila-tempest-dsvm-scenario/run.yaml b/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
deleted file mode 100644
index a54560e2..00000000
--- a/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-dsvm-scenario from old job gate-manila-tempest-dsvm-scenario-ubuntu-xenial-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-
-          EOF
-        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_NEUTRON=1
-          export DEVSTACK_GATE_POSTGRES=0
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-
-          # Install manila-image-elements project for building custom image
-          if [[ generic == *"_with_custom_image" ]]; then
-              export PROJECTS="openstack/manila-image-elements $PROJECTS"
-          fi
-          export ENABLED_SERVICES=tempest
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Build custom image if needed
-              if [[ generic == *"_with_custom_image" ]]; then
-                  current_dir=$(pwd)
-
-                  # Go to 'manila-image-elements' dir, build image and get its name
-                  cd /opt/stack/new/manila-image-elements
-                  ./tools/gate/build-images generic True
-                  image_name=$(git ls-files --others --exclude-standard)
-                  export MANILA_SERVICE_IMAGE_URL="http://localhost:80/public_html/$image_name"
-                  export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
-
-                  # Return back to execution dir
-                  cd $current_dir
-              fi
-
-              # 'dhss' - acronym for 'Driver Handles Share Servers',
-              # defines mode of a share driver. Boolean-like.
-              # 'driver' - codename of a share driver to configure.
-              # 'back_end_type' - defines which installation Manila should
-              # have - either 'singlebackend' or 'multibackend'.
-              source $BASE/new/manila/contrib/ci/pre_test_hook.sh \
-                  1 \
-                  generic \
-                  multibackend
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # 'back_end_type' - defines which installation Manila is
-              # configured to - either 'singlebackend' or 'multibackend'.
-              # 'driver' - codename of a share driver that is configured in
-              # Manila. It is used for enabling/disabling tests that are not
-              # supported by share driver that is used.
-              # 'test_type' - defines which set of test suites should be used,
-              # can have 'api' and 'scenario' values.
-              # 'postgres_enabled' - set of test suites depends on DB backend
-              # in some cases, so it is provided explicitely. Boolean-like.
-              source $BASE/new/manila/contrib/ci/post_test_hook.sh \
-                  multibackend \
-                  generic \
-                  scenario \
-                  0
-          }
-          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/manila-tempest-minimal-dsvm-cephfs-native-centos-7/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-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/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml
deleted file mode 100644
index d9d6fb46..00000000
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-minimal-dsvm-cephfs-native-centos-7
-    from old job gate-manila-tempest-minimal-dsvm-cephfs-native-centos-7-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-
-          enable_plugin devstack-plugin-ceph git://git.openstack.org/openstack/devstack-plugin-ceph
-
-          # Enable CephFS as the backend for Manila.
-          ENABLE_CEPH_MANILA=True
-
-          # Disable Ceph as the storage backend for Nova.
-          ENABLE_CEPH_NOVA=False
-
-          # Disable Ceph as the storage backend for Glance.
-          ENABLE_CEPH_GLANCE=False
-
-          # Disable Ceph as the storage backend for Cinder.
-          ENABLE_CEPH_CINDER=False
-
-          # Disable Ceph as the storage backend for Cinder backup.
-          ENABLE_CEPH_C_BAK=False
-
-          # Set native or NFS variant of ceph driver
-          MANILA_CEPH_DRIVER=cephfsnative
-
-          EOF
-        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_NEUTRON=1
-          export ENABLED_SERVICES=tempest
-          export PROJECTS="openstack/devstack-plugin-ceph $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Configure Manila with a CephFS Native or NFS driver backend.
-              # Refer to job-template pre_test_hook for more details on the
-              # arguments.
-              source $BASE/new/devstack-plugin-ceph/manila/pre_test_hook.sh \
-                  false cephfsnative singlebackend
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # Configure and run Tempest API tests on Manila with a
-              # CephFSNative driver backend.
-              # Refer to job-template post_test_hook for more details on the
-              # arguments.
-              source $BASE/new/devstack-plugin-ceph/manila/post_test_hook.sh \
-                  singlebackend cephfsnative 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/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-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/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml
deleted file mode 100644
index 18b59583..00000000
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-minimal-dsvm-cephfs-nfs-centos-7 from
-    old job gate-manila-tempest-minimal-dsvm-cephfs-nfs-centos-7-nv
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-
-          enable_plugin devstack-plugin-ceph git://git.openstack.org/openstack/devstack-plugin-ceph
-
-          # Enable CephFS as the backend for Manila.
-          ENABLE_CEPH_MANILA=True
-
-          # Disable Ceph as the storage backend for Nova.
-          ENABLE_CEPH_NOVA=False
-
-          # Disable Ceph as the storage backend for Glance.
-          ENABLE_CEPH_GLANCE=False
-
-          # Disable Ceph as the storage backend for Cinder.
-          ENABLE_CEPH_CINDER=False
-
-          # Disable Ceph as the storage backend for Cinder backup.
-          ENABLE_CEPH_C_BAK=False
-
-          # Set native or NFS variant of ceph driver
-          MANILA_CEPH_DRIVER=cephfsnfs
-
-          EOF
-        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_NEUTRON=1
-          export ENABLED_SERVICES=tempest
-          export PROJECTS="openstack/devstack-plugin-ceph $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Configure Manila with a CephFS Native or NFS driver backend.
-              # Refer to job-template pre_test_hook for more details on the
-              # arguments.
-              source $BASE/new/devstack-plugin-ceph/manila/pre_test_hook.sh \
-                  false cephfsnfs singlebackend
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # Configure and run Tempest API tests on Manila with a
-              # CephFSNative driver backend.
-              # Refer to job-template post_test_hook for more details on the
-              # arguments.
-              source $BASE/new/devstack-plugin-ceph/manila/post_test_hook.sh \
-                  singlebackend cephfsnfs 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/manila-tempest-minimal-dsvm-dummy/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/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/manila-tempest-minimal-dsvm-dummy/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
deleted file mode 100644
index 1e7ea355..00000000
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-minimal-dsvm-dummy from old job gate-manila-tempest-minimal-dsvm-dummy-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-
-          EOF
-        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_NEUTRON=1
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-          # Basic services needed for minimal job
-          OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
-          if [ "dummy" == "lvm" ]; then
-              # Enable glance for scenario tests
-              OVERRIDE_ENABLED_SERVICES+=,g-api,g-reg
-              # Enable nova for scenario tests
-              OVERRIDE_ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj
-              # Enable neutron for scenario tests
-              OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt
-
-              # Enable mandatory placement services for nova starting with ocata
-              if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
-                 OVERRIDE_ENABLED_SERVICES+=,placement-api,placement-client
-              fi
-          fi
-          export OVERRIDE_ENABLED_SERVICES
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # 'dhss' - acronym for 'Driver Handles Share Servers',
-              # defines mode of a share driver. Boolean-like.
-              # 'driver' - codename of a share driver to configure.
-              # 'back_end_type' - defines which installation Manila should
-              # have - either 'singlebackend' or 'multibackend'.
-              source $BASE/new/manila/contrib/ci/pre_test_hook.sh False dummy multibackend
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # 'back_end_type' - defines which installation Manila is
-              # configured to - either 'singlebackend' or 'multibackend'.
-              # 'driver' - codename of a share driver that is configured in
-              # Manila. It is used for enabling/disabling tests that are not
-              # supported by share driver that is used.
-              # 'test_type' - defines which set of test suites should be used,
-              # can have 'api' and 'scenario' values.
-              # 'postgres_enabled' - set of test suites depends on DB backend
-              # in some cases, so it is provided explicitely. Boolean-like.
-              source $BASE/new/manila/contrib/ci/post_test_hook.sh multibackend dummy api False
-          }
-          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/manila-tempest-minimal-dsvm-lvm-centos-7/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-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/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml
deleted file mode 100644
index 280c05b7..00000000
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-minimal-dsvm-lvm-centos-7 from old
-    job gate-manila-tempest-minimal-dsvm-lvm-centos-7
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-
-          EOF
-        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_NEUTRON=1
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-          # Basic services needed for minimal job
-          OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,tempest
-          if [ "lvm" == "lvm" ]; then
-              # Enable glance for scenario tests
-              OVERRIDE_ENABLED_SERVICES+=,g-api,g-reg
-              # Enable nova for scenario tests
-              OVERRIDE_ENABLED_SERVICES+=,n-api,n-cpu,n-cond,n-sch,n-crt,n-cauth,n-obj
-              # Enable neutron for scenario tests
-              OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt
-
-              # Enable mandatory placement services for nova starting with ocata
-              if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
-                 OVERRIDE_ENABLED_SERVICES+=,placement-api,placement-client
-              fi
-          fi
-          export OVERRIDE_ENABLED_SERVICES
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # 'dhss' - acronym for 'Driver Handles Share Servers',
-              # defines mode of a share driver. Boolean-like.
-              # 'driver' - codename of a share driver to configure.
-              # 'back_end_type' - defines which installation Manila should
-              # have - either 'singlebackend' or 'multibackend'.
-              source $BASE/new/manila/contrib/ci/pre_test_hook.sh False lvm multibackend
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # 'back_end_type' - defines which installation Manila is
-              # configured to - either 'singlebackend' or 'multibackend'.
-              # 'driver' - codename of a share driver that is configured in
-              # Manila. It is used for enabling/disabling tests that are not
-              # supported by share driver that is used.
-              # 'test_type' - defines which set of test suites should be used,
-              # can have 'api' and 'scenario' values.
-              # 'postgres_enabled' - set of test suites depends on DB backend
-              # in some cases, so it is provided explicitely. Boolean-like.
-              source $BASE/new/manila/contrib/ci/post_test_hook.sh multibackend lvm api False
-          }
-          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/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/post.yaml b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-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/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml
deleted file mode 100644
index b399798c..00000000
--- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7
-    from old job gate-manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7-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]]
-
-          # swift is not ready for python3 yet
-          disable_service s-account
-          disable_service s-container
-          disable_service s-object
-          disable_service s-proxy
-
-          enable_plugin manila git://git.openstack.org/openstack/manila
-
-          enable_plugin devstack-plugin-ceph git://git.openstack.org/openstack/devstack-plugin-ceph
-
-          # Enable CephFS as the backend for Manila.
-          ENABLE_CEPH_MANILA=True
-
-          # Disable Ceph as the storage backend for Nova.
-          ENABLE_CEPH_NOVA=False
-
-          # Disable Ceph as the storage backend for Glance.
-          ENABLE_CEPH_GLANCE=False
-
-          # Disable Ceph as the storage backend for Cinder.
-          ENABLE_CEPH_CINDER=False
-
-          # Disable Ceph as the storage backend for Cinder backup.
-          ENABLE_CEPH_C_BAK=False
-
-          # Set native or NFS variant of ceph driver
-          MANILA_CEPH_DRIVER=cephfsnative
-
-          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 DEVSTACK_GATE_NEUTRON=1
-          export ENABLED_SERVICES=tempest
-          export PROJECTS="openstack/python-manilaclient openstack/devstack-plugin-ceph $PROJECTS"
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Configure Manila with a CephFS Native or NFS driver backend.
-              # Refer to job-template pre_test_hook for more details on the
-              # arguments.
-              source $BASE/new/devstack-plugin-ceph/manila/pre_test_hook.sh \
-                  false cephfsnative singlebackend
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # Configure and run Tempest API tests on Manila with a
-              # CephFSNative driver backend.
-              # Refer to job-template post_test_hook for more details on the
-              # arguments.
-              source $BASE/new/devstack-plugin-ceph/manila/post_test_hook.sh \
-                  singlebackend cephfsnative 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/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/post.yaml b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/post.yaml
deleted file mode 100644
index e07f5510..00000000
--- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-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/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml
deleted file mode 100644
index 4fadac05..00000000
--- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7
-    from old job gate-manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7-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]]
-
-          # swift is not ready for python3 yet
-          disable_service s-account
-          disable_service s-container
-          disable_service s-object
-          disable_service s-proxy
-
-          enable_plugin manila git://git.openstack.org/openstack/manila
-
-          enable_plugin devstack-plugin-ceph git://git.openstack.org/openstack/devstack-plugin-ceph
-
-          # Enable CephFS as the backend for Manila.
-          ENABLE_CEPH_MANILA=True
-
-          # Disable Ceph as the storage backend for Nova.
-          ENABLE_CEPH_NOVA=False
-
-          # Disable Ceph as the storage backend for Glance.
-          ENABLE_CEPH_GLANCE=False
-
-          # Disable Ceph as the storage backend for Cinder.
-          ENABLE_CEPH_CINDER=False
-
-          # Disable Ceph as the storage backend for Cinder backup.
-          ENABLE_CEPH_C_BAK=False
-
-          # Set native or NFS variant of ceph driver
-          MANILA_CEPH_DRIVER=cephfsnfs
-
-          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 DEVSTACK_GATE_NEUTRON=1
-          export ENABLED_SERVICES=tempest
-          export PROJECTS="openstack/python-manilaclient openstack/devstack-plugin-ceph $PROJECTS"
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Configure Manila with a CephFS Native or NFS driver backend.
-              # Refer to job-template pre_test_hook for more details on the
-              # arguments.
-              source $BASE/new/devstack-plugin-ceph/manila/pre_test_hook.sh \
-                  false cephfsnfs singlebackend
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              # Configure and run Tempest API tests on Manila with a
-              # CephFSNative driver backend.
-              # Refer to job-template post_test_hook for more details on the
-              # arguments.
-              source $BASE/new/devstack-plugin-ceph/manila/post_test_hook.sh \
-                  singlebackend cephfsnfs 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/manila-tox-genconfig/post.yaml b/playbooks/legacy/manila-tox-genconfig/post.yaml
deleted file mode 100644
index 68fbdf81..00000000
--- a/playbooks/legacy/manila-tox-genconfig/post.yaml
+++ /dev/null
@@ -1,67 +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=**/*nose_results.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testr_results.html.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=/.testrepository/tmp*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=**/*testrepository.subunit.gz
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}/tox'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/.tox/*/log/*
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/manila-tox-genconfig/run.yaml b/playbooks/legacy/manila-tox-genconfig/run.yaml
deleted file mode 100644
index c602bac4..00000000
--- a/playbooks/legacy/manila-tox-genconfig/run.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-manila-tox-genconfig from old job gate-manila-tox-genconfig-ubuntu-xenial
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          CLONEMAP=`mktemp`
-          REQS_DIR=`mktemp -d`
-          function cleanup {
-              mkdir -p $WORKSPACE
-              rm -rf $CLONEMAP $REQS_DIR
-          }
-          trap cleanup EXIT
-          cat > $CLONEMAP << EOF
-          clonemap:
-            - name: $ZUUL_PROJECT
-              dest: .
-          EOF
-          # zuul cloner works poorly if there are 2 names that are the
-          # same in here.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-          cat >> $CLONEMAP << EOF
-            - name: openstack/requirements
-              dest: $REQS_DIR
-          EOF
-          fi
-          /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \
-              git://git.openstack.org $ZUUL_PROJECT openstack/requirements
-          # REQS_DIR is not set for openstack/requirements and there is also
-          # no need to copy in this case.
-          if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then
-              cp $REQS_DIR/upper-constraints.txt ./
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/install-distro-packages.sh
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          if [ -x tools/test-setup.sh ] ; then
-            tools/test-setup.sh
-          fi
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -x
-          sudo rm -f /etc/sudoers.d/zuul
-          # Prove that general sudo access is actually revoked
-          ! sudo -n true
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: /usr/local/jenkins/slave_scripts/run-tox.sh genconfig
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          OUT=`git ls-files --other --exclude-standard --directory`
-          if [ -z "$OUT" ]; then
-              echo "No extra files created during test."
-              exit 0
-          else
-              echo "The following un-ignored files were created during the test:"
-              echo "$OUT"
-              exit 0  # TODO: change to 1 to fail tests.
-          fi
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml b/playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml
deleted file mode 100644
index 4c699fc1..00000000
--- a/playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-- hosts: primary
-  tasks:
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/logs/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: 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=/rally-plot/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=/rally-plot/extra/index.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/run.yaml b/playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/run.yaml
deleted file mode 100644
index 8561abb1..00000000
--- a/playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/run.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-rally-dsvm-manila-multibackend-no-ss from old job
-    gate-rally-dsvm-manila-multibackend-no-ss
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-          enable_plugin rally git://git.openstack.org/openstack/rally
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-
-          if [ $ZUUL_PROJECT == "openstack/rally" ] && [ $ZUUL_BRANCH != "master" ]; then
-              export DEVSTACK_GATE_FEATURE_MATRIX="/opt/stack/new/rally/devstack/features.yaml"
-          fi
-
-          export PROJECTS="openstack/rally $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-
-          # Run only manila services, because only main manila functionality
-          # will be tested with 'dummy' share driver that does not use real
-          # storage back ends. Also, it will speed up devstack installation.
-          export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit
-
-          export IDENTITY_API_VERSION=3
-
-          export DEVSTACK_GATE_NEUTRON=1
-          export RALLY_SCENARIO=rally-manila-no-ss
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Install manila-devstack integration
-              # 'dhss' means 'drivers handle share servers'
-              # 'driver' is codename of shar driver in manila
-              # that is used for proper configuration of storage backend.
-              source $BASE/new/manila/contrib/ci/pre_test_hook.sh 0 dummy 'multibackend'
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              source $BASE/new/manila/contrib/ci/common.sh
-              manila_wait_for_drivers_init /etc/manila/manila.conf
-              $BASE/new/rally/tests/ci/rally-gate.sh
-          }
-          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/rally-dsvm-manila-multibackend/post.yaml b/playbooks/legacy/rally-dsvm-manila-multibackend/post.yaml
deleted file mode 100644
index 4c699fc1..00000000
--- a/playbooks/legacy/rally-dsvm-manila-multibackend/post.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-- hosts: primary
-  tasks:
-
-    - name: Copy files from {{ ansible_user_dir }}/workspace/ on node
-      synchronize:
-        src: '{{ ansible_user_dir }}/workspace/'
-        dest: '{{ zuul.executor.log_root }}'
-        mode: pull
-        copy_links: true
-        verify_host: true
-        rsync_opts:
-          - --include=/logs/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - name: 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=/rally-plot/**
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
-
-    - 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=/rally-plot/extra/index.html
-          - --include=*/
-          - --exclude=*
-          - --prune-empty-dirs
diff --git a/playbooks/legacy/rally-dsvm-manila-multibackend/run.yaml b/playbooks/legacy/rally-dsvm-manila-multibackend/run.yaml
deleted file mode 100644
index 6b250cff..00000000
--- a/playbooks/legacy/rally-dsvm-manila-multibackend/run.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-- hosts: all
-  name: Autoconverted job legacy-rally-dsvm-manila-multibackend from old job gate-rally-dsvm-manila-multibackend
-  tasks:
-
-    - name: Ensure legacy workspace directory
-      file:
-        path: '{{ ansible_user_dir }}/workspace'
-        state: directory
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat > clonemap.yaml << EOF
-          clonemap:
-            - name: openstack-infra/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              git://git.openstack.org \
-              openstack-infra/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          enable_plugin manila git://git.openstack.org/openstack/manila
-          enable_plugin rally git://git.openstack.org/openstack/rally
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-
-          if [ $ZUUL_PROJECT == "openstack/rally" ] && [ $ZUUL_BRANCH != "master" ]; then
-              export DEVSTACK_GATE_FEATURE_MATRIX="/opt/stack/new/rally/devstack/features.yaml"
-          fi
-
-          export PROJECTS="openstack/rally $PROJECTS"
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-
-          # Run only manila services, because only main manila functionality
-          # will be tested with 'dummy' share driver that does not use real
-          # storage back ends. Also, it will speed up devstack installation.
-          export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit
-
-          export IDENTITY_API_VERSION=3
-
-          export DEVSTACK_GATE_NEUTRON=1
-          export RALLY_SCENARIO=rally-manila
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-
-          function pre_test_hook {
-              # Install manila-devstack integration
-              # 'dhss' means 'drivers handle share servers'
-              # 'driver' is codename of shar driver in manila
-              # that is used for proper configuration of storage backend.
-              source $BASE/new/manila/contrib/ci/pre_test_hook.sh 1 dummy 'multibackend'
-          }
-          export -f pre_test_hook
-
-          function post_test_hook {
-              source $BASE/new/manila/contrib/ci/common.sh
-              manila_wait_for_drivers_init /etc/manila/manila.conf
-              $BASE/new/rally/tests/ci/rally-gate.sh
-          }
-          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 06e385d0..f7d730fd 100644
--- a/zuul.d/zuul-legacy-jobs.yaml
+++ b/zuul.d/zuul-legacy-jobs.yaml
@@ -2064,18 +2064,6 @@
       - openstack/python-ironicclient
       - openstack/virtualbmc
 
-- job:
-    name: legacy-grenade-dsvm-manila
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/grenade-dsvm-manila/run
-    post-run: playbooks/legacy/grenade-dsvm-manila/post
-    timeout: 10800
-    required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
-      - openstack/manila
-      - openstack/python-manilaclient
-
 - job:
     name: legacy-grenade-dsvm-mongodb-zaqar
     parent: legacy-dsvm-base
@@ -3763,271 +3751,12 @@
     post-run: playbooks/legacy/manila-publishimage-generic/post
     timeout: 1800
 
-- job:
-    name: legacy-manila-tempest-dsvm-container-scenario-custom-image
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run
-    post-run: playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post
-    timeout: 5400
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/manila
-      - openstack/manila-image-elements
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-dsvm-generic-no-share-servers
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run
-    post-run: playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post
-    timeout: 5400
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/manila
-      - openstack/manila-image-elements
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-dsvm-generic-scenario-custom-image
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run
-    post-run: playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post
-    timeout: 5400
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/manila
-      - openstack/manila-image-elements
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-dsvm-glusterfs-native
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run
-    post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post
-    timeout: 4800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-glusterfs
-      - openstack/manila
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-dsvm-glusterfs-native-heketi
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run
-    post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post
-    timeout: 4800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-glusterfs
-      - openstack/manila
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-dsvm-glusterfs-nfs
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run
-    post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post
-    timeout: 4800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-glusterfs
-      - openstack/manila
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-dsvm-glusterfs-nfs-heketi
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run
-    post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post
-    timeout: 4800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-glusterfs
-      - openstack/manila
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-dsvm-hdfs
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-dsvm-hdfs/run
-    post-run: playbooks/legacy/manila-tempest-dsvm-hdfs/post
-    timeout: 4800
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-hdfs
-      - openstack/manila
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-dsvm-mysql-generic
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-dsvm-mysql-generic/run
-    post-run: playbooks/legacy/manila-tempest-dsvm-mysql-generic/post
-    timeout: 5400
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/manila
-      - openstack/manila-image-elements
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-dsvm-postgres-container
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-dsvm-postgres-container/run
-    post-run: playbooks/legacy/manila-tempest-dsvm-postgres-container/post
-    timeout: 5400
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/manila
-      - openstack/manila-image-elements
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-dsvm-postgres-generic-singlebackend
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run
-    post-run: playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post
-    timeout: 5400
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/manila
-      - openstack/manila-image-elements
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-dsvm-postgres-zfsonlinux
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run
-    post-run: playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post
-    timeout: 5400
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/manila
-      - openstack/manila-image-elements
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-dsvm-scenario
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-dsvm-scenario/run
-    post-run: playbooks/legacy/manila-tempest-dsvm-scenario/post
-    timeout: 5400
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/manila
-      - openstack/manila-image-elements
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-minimal-dsvm-cephfs-native-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run
-    post-run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/post
-    timeout: 4800
-    nodeset: legacy-centos-7
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-ceph
-      - openstack/manila
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-minimal-dsvm-cephfs-nfs-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run
-    post-run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/post
-    timeout: 4800
-    nodeset: legacy-centos-7
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-ceph
-      - openstack/manila
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-minimal-dsvm-dummy
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run
-    post-run: playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post
-    timeout: 5400
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/manila
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-minimal-dsvm-lvm-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run
-    post-run: playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/post
-    timeout: 5400
-    nodeset: legacy-centos-7
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/manila
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run
-    post-run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/post
-    timeout: 4800
-    nodeset: legacy-centos-7
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-ceph
-      - openstack/manila
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: legacy-manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run
-    post-run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/post
-    timeout: 4800
-    nodeset: legacy-centos-7
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-ceph
-      - openstack/manila
-      - openstack/python-manilaclient
-      - openstack/tempest
-
 - job:
     name: legacy-manila-test-image-build
     parent: legacy-base
     run: playbooks/legacy/manila-test-image-build/run
     timeout: 3600
 
-- job:
-    name: legacy-manila-tox-genconfig
-    parent: legacy-base
-    run: playbooks/legacy/manila-tox-genconfig/run
-    post-run: playbooks/legacy/manila-tox-genconfig/post
-    timeout: 2400
-    required-projects:
-      - openstack/requirements
-
 - job:
     name: legacy-manila-ui-dsvm
     parent: legacy-dsvm-base
@@ -7740,30 +7469,6 @@
       - openstack/watcher
       - openstack/zaqar-ui
 
-- job:
-    name: legacy-rally-dsvm-manila-multibackend
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/rally-dsvm-manila-multibackend/run
-    post-run: playbooks/legacy/rally-dsvm-manila-multibackend/post
-    timeout: 4200
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/manila
-      - openstack/python-manilaclient
-      - openstack/rally
-
-- job:
-    name: legacy-rally-dsvm-manila-multibackend-no-ss
-    parent: legacy-dsvm-base
-    run: playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/run
-    post-run: playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/post
-    timeout: 4200
-    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/manila
-      - openstack/python-manilaclient
-      - openstack/rally
-
 - job:
     name: legacy-rally-dsvm-mistral-rally
     parent: legacy-dsvm-base