diff --git a/.zuul.yaml b/.zuul.yaml
index 079ce07dc0..ddfabd1bde 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -13,13 +13,26 @@
         - openstack-tox-pylint:
             voting: false
         - manila-tox-genconfig
+        - manila-tempest-minimal-dsvm-dummy
+        - manila-tempest-minimal-dsvm-lvm
+        - manila-tempest-dsvm-mysql-generic:
+            voting: false
+        - manila-tempest-dsvm-postgres-container:
+            voting: false
+        - manila-tempest-dsvm-postgres-zfsonlinux:
+            voting: false
+        - manila-tempest-dsvm-postgres-generic-singlebackend:
+            voting: false
+        - manila-tempest-dsvm-generic-no-share-servers:
+            voting: false
+        - manila-tempest-dsvm-scenario:
+            voting: false
     gate:
       queue: manila
       jobs:
         - manila-tox-genconfig
-    post:
-      jobs:
-        - openstack-tox-cover
+        - manila-tempest-minimal-dsvm-dummy
+        - manila-tempest-minimal-dsvm-lvm
 
 - job:
     name: manila-tox-genconfig
@@ -30,3 +43,131 @@
       Uses tox with the ``genconfig`` environment.
     vars:
       tox_envlist: genconfig
+
+- job:
+    name: legacy-manila-tempest-dsvm-base
+    parent: legacy-dsvm-base
+    irrelevant-files:
+      - ^(test-|)requirements.txt$
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^install-guide/.*$
+      - ^manila/hacking/.*$
+      - ^manila/tests/.*$
+      - ^releasenotes/.*$
+      - ^run_tests.sh$
+      - ^setup.cfg$
+      - ^tools/.*$
+      - ^tox.ini$
+
+- job:
+    name: manila-tempest-dsvm-generic-no-share-servers
+    parent: legacy-manila-tempest-dsvm-base
+    run: playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
+    post-run: playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml
+    timeout: 5400
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/manila
+      - openstack/manila-image-elements
+      - openstack/python-manilaclient
+      - openstack/tempest
+
+- job:
+    name: manila-tempest-dsvm-mysql-generic
+    parent: legacy-manila-tempest-dsvm-base
+    run: playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
+    post-run: playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml
+    timeout: 5400
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/manila
+      - openstack/manila-image-elements
+      - openstack/python-manilaclient
+      - openstack/tempest
+
+- job:
+    name: manila-tempest-dsvm-postgres-container
+    parent: legacy-manila-tempest-dsvm-base
+    run: playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
+    post-run: playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml
+    timeout: 5400
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/manila
+      - openstack/manila-image-elements
+      - openstack/python-manilaclient
+      - openstack/tempest
+
+- job:
+    name: manila-tempest-dsvm-postgres-generic-singlebackend
+    parent: legacy-manila-tempest-dsvm-base
+    run: playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
+    post-run: playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml
+    timeout: 5400
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/manila
+      - openstack/manila-image-elements
+      - openstack/python-manilaclient
+      - openstack/tempest
+
+- job:
+    name: manila-tempest-dsvm-postgres-zfsonlinux
+    parent: legacy-manila-tempest-dsvm-base
+    run: playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
+    post-run: playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml
+    timeout: 5400
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/manila
+      - openstack/manila-image-elements
+      - openstack/python-manilaclient
+      - openstack/tempest
+
+- job:
+    name: manila-tempest-dsvm-scenario
+    parent: legacy-manila-tempest-dsvm-base
+    run: playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
+    post-run: playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml
+    timeout: 5400
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/manila
+      - openstack/manila-image-elements
+      - openstack/python-manilaclient
+      - openstack/tempest
+
+- job:
+    name: manila-tempest-minimal-dsvm-dummy
+    parent: legacy-manila-tempest-dsvm-base
+    run: playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
+    post-run: playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml
+    timeout: 5400
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/manila
+      - openstack/python-manilaclient
+      - openstack/tempest
+
+- job:
+    name: manila-tempest-minimal-dsvm-lvm
+    parent: legacy-manila-tempest-dsvm-base
+    run: playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml
+    post-run: playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml
+    timeout: 5400
+    required-projects:
+      - openstack-infra/devstack-gate
+      - openstack/manila
+      - openstack/python-manilaclient
+      - openstack/tempest
+
+- job:
+    name: manila-tox-genconfig
+    parent: openstack-tox
+    description: |
+      Run tests for manila project.
+      Uses tox with the ``genconfig`` environment.
+    vars:
+      tox_envlist: genconfig
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
new file mode 100644
index 0000000000..e07f5510ae
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml
@@ -0,0 +1,15 @@
+- 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
new file mode 100644
index 0000000000..28ec904550
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
@@ -0,0 +1,108 @@
+- 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-mysql-generic/post.yaml b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml
new file mode 100644
index 0000000000..e07f5510ae
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml
@@ -0,0 +1,15 @@
+- 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
new file mode 100644
index 0000000000..83de354dd7
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
@@ -0,0 +1,107 @@
+- 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
new file mode 100644
index 0000000000..e07f5510ae
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml
@@ -0,0 +1,15 @@
+- 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
new file mode 100644
index 0000000000..eba61e68d6
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
@@ -0,0 +1,108 @@
+- 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
new file mode 100644
index 0000000000..e07f5510ae
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml
@@ -0,0 +1,15 @@
+- 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
new file mode 100644
index 0000000000..9310e03fd3
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
@@ -0,0 +1,108 @@
+- 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
new file mode 100644
index 0000000000..e07f5510ae
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml
@@ -0,0 +1,15 @@
+- 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
new file mode 100644
index 0000000000..c9f6c12e26
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
@@ -0,0 +1,108 @@
+- 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
new file mode 100644
index 0000000000..e07f5510ae
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml
@@ -0,0 +1,15 @@
+- 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
new file mode 100644
index 0000000000..a54560e260
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
@@ -0,0 +1,107 @@
+- 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-dummy/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml
new file mode 100644
index 0000000000..e07f5510ae
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml
@@ -0,0 +1,15 @@
+- 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
new file mode 100644
index 0000000000..1e7ea355ec
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
@@ -0,0 +1,94 @@
+- 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/post.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml
new file mode 100644
index 0000000000..e07f5510ae
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/post.yaml
@@ -0,0 +1,15 @@
+- 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/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml
new file mode 100644
index 0000000000..e0d12f52d9
--- /dev/null
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml
@@ -0,0 +1,96 @@
+- hosts: all
+  name: Autoconverted job legacy-manila-tempest-minimal-dsvm-lvm from old
+    job gate-manila-tempest-minimal-dsvm-lvm
+  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]]
+          SKIP_EPEL_INSTALL=True
+          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/rally-jobs/rally-manila-no-ss.yaml b/rally-jobs/rally-manila-no-ss.yaml
deleted file mode 100644
index b3b192eadf..0000000000
--- a/rally-jobs/rally-manila-no-ss.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
----
-  Dummy.openstack:
-    -
-      description: "Check quotas context"
-      runner:
-        type: "constant"
-        times: 1
-        concurrency: 1
-      context:
-        users:
-          tenants: 1
-          users_per_tenant: 1
-        quotas:
-          manila:
-            shares: -1
-            gigabytes: -1
-            snapshots: -1
-            snapshot_gigabytes: -1
-            share_networks: -1
-
-  ManilaShares.list_shares:
-    -
-      args:
-        detailed: True
-      runner:
-        type: "constant"
-        times: 10
-        concurrency: 10
-      context:
-        users:
-          tenants: 1
-          users_per_tenant: 1
-      sla:
-        failure_rate:
-          max: 0
-
-  {% for s in ("create_and_delete_share", "create_and_list_share") %}
-  ManilaShares.{{s}}:
-    -
-      args:
-        share_proto: "nfs"
-        size: 1
-        share_type: "dhss_false"
-        min_sleep: 1
-        max_sleep: 2
-      runner:
-        type: "constant"
-        times: 10
-        concurrency: 10
-      context:
-        quotas:
-          manila:
-            shares: -1
-            gigabytes: -1
-        users:
-          tenants: 2
-          users_per_tenant: 1
-      sla:
-        failure_rate:
-          max: 0
-  {% endfor %}
-
-
-  ManilaShares.set_and_delete_metadata:
-    -
-      args:
-        sets: 1
-        set_size: 3
-        delete_size: 3
-        key_min_length: 1
-        key_max_length: 256
-        value_min_length: 1
-        value_max_length: 1024
-      runner:
-        type: "constant"
-        times: 10
-        concurrency: 10
-      context:
-        quotas:
-          manila:
-            shares: -1
-            gigabytes: -1
-        users:
-          tenants: 1
-          users_per_tenant: 1
-        manila_shares:
-          shares_per_tenant: 1
-          share_proto: "NFS"
-          size: 1
-          share_type: "dhss_false"
-      sla:
-        failure_rate:
-          max: 0
diff --git a/rally-jobs/rally-manila.yaml b/rally-jobs/rally-manila.yaml
deleted file mode 100644
index 68f3b1eaf5..0000000000
--- a/rally-jobs/rally-manila.yaml
+++ /dev/null
@@ -1,199 +0,0 @@
----
-  Dummy.openstack:
-    -
-      description: "Check quotas context"
-      runner:
-        type: "constant"
-        times: 1
-        concurrency: 1
-      context:
-        users:
-          tenants: 1
-          users_per_tenant: 1
-        quotas:
-          manila:
-            shares: -1
-            gigabytes: -1
-            snapshots: -1
-            snapshot_gigabytes: -1
-            share_networks: -1
-
-  ManilaShares.list_shares:
-    -
-      args:
-        detailed: True
-      runner:
-        type: "constant"
-        times: 10
-        concurrency: 10
-      context:
-        users:
-          tenants: 3
-          users_per_tenant: 4
-          user_choice_method: "round_robin"
-      sla:
-        failure_rate:
-          max: 0
-
-  {% for s in ("create_and_delete_share", "create_and_list_share") %}
-  ManilaShares.{{s}}:
-    -
-      args:
-        share_proto: "nfs"
-        size: 1
-        share_type: "dhss_true"
-        min_sleep: 1
-        max_sleep: 2
-      runner:
-        type: "constant"
-        times: 10
-        concurrency: 10
-      context:
-        quotas:
-          manila:
-            shares: -1
-            gigabytes: -1
-            share_networks: -1
-        users:
-          tenants: 2
-          users_per_tenant: 1
-          user_choice_method: "round_robin"
-        manila_share_networks:
-          use_share_networks: True
-      sla:
-        failure_rate:
-          max: 0
-  {% endfor %}
-
-  ManilaShares.create_share_network_and_delete:
-    -
-      args:
-        name: "rally"
-      runner:
-        type: "constant"
-        times: 10
-        concurrency: 10
-      context:
-        quotas:
-          manila:
-            share_networks: -1
-        users:
-          tenants: 2
-          users_per_tenant: 1
-      sla:
-        failure_rate:
-          max: 0
-
-  ManilaShares.create_share_network_and_list:
-    -
-      args:
-        name: "rally"
-        detailed: True
-        search_opts:
-          name: "rally"
-      runner:
-        type: "constant"
-        times: 10
-        concurrency: 10
-      context:
-        quotas:
-          manila:
-            share_networks: -1
-        users:
-          tenants: 2
-          users_per_tenant: 1
-      sla:
-        failure_rate:
-          max: 0
-
-  ManilaShares.list_share_servers:
-    -
-      args:
-        search_opts: {}
-      runner:
-        type: "constant"
-        times: 10
-        concurrency: 10
-      sla:
-        failure_rate:
-          max: 0
-
-  ManilaShares.create_security_service_and_delete:
-  {% for s in ("ldap", "kerberos", "active_directory") %}
-    -
-      args:
-        security_service_type: {{s}}
-        dns_ip: "fake_dns_ip"
-        server: "fake-server"
-        domain: "fake_domain"
-        user: "fake_user"
-        password: "fake_password"
-        name: "fake_name"
-        description: "fake_description"
-      runner:
-        type: "constant"
-        times: 10
-        concurrency: 10
-      context:
-        users:
-          tenants: 1
-          users_per_tenant: 1
-      sla:
-        failure_rate:
-          max: 0
-  {% endfor %}
-
-  ManilaShares.attach_security_service_to_share_network:
-  {% for s in ("ldap", "kerberos", "active_directory") %}
-    -
-      args:
-        security_service_type: {{s}}
-      runner:
-        type: "constant"
-        times: 10
-        concurrency: 10
-      context:
-        users:
-          tenants: 1
-          users_per_tenant: 1
-        quotas:
-          manila:
-            share_networks: -1
-      sla:
-        failure_rate:
-          max: 0
-  {% endfor %}
-
-  ManilaShares.set_and_delete_metadata:
-    -
-      args:
-        sets: 1
-        set_size: 3
-        delete_size: 3
-        key_min_length: 1
-        key_max_length: 256
-        value_min_length: 1
-        value_max_length: 1024
-      runner:
-        type: "constant"
-        times: 10
-        concurrency: 10
-      context:
-        quotas:
-          manila:
-            shares: -1
-            gigabytes: -1
-            share_networks: -1
-        users:
-          tenants: 1
-          users_per_tenant: 1
-        manila_share_networks:
-          use_share_networks: True
-        manila_shares:
-          shares_per_tenant: 1
-          share_proto: "NFS"
-          size: 1
-          share_type: "dhss_true"
-      sla:
-        failure_rate:
-          max: 0