Fix CI issues and adjust test jobs

It is incorrect to install tempest and manila-tempest-plugin
globally in devstack jobs. So this commit removes the use
of the test plugin's devstack installation hook, and uses
a "tempest-venv" that devstack sets up to run the tests.

To stay consistent with later branches, we enhance
the devstack plugin.sh script to set api versions
as tempest configuration options.

Drop Rally testing since the jobs are
broken and no API perf regressions
are expected to be caught on this branch
that we don't also see in newer maintained
branches.

We don't lose much test coverage if we drop
some test jobs:

- manila-tempest-dsvm-postgres-generic-singlebackend
"single backend" jobs are not very useful.
postgresql is tested elsewhere

- manila-tempest-dsvm-generic-no-share-servers
We have other DHSS=False reference drivers, don't
need to test this generic driver job on every commit.
We can move this to the experimental queue so we
can call on it if necessary.

- manila-tempest-dsvm-glusterfs-nfs-heketi
 and manila-tempest-dsvm-glusterfs-native-heketi
Neither of these jobs are maintained, and they've
been unused in the experimental queue.

So drop these jobs, and delete some playbooks
and code for the unused/orphaned test jobs.

Depends-On: I2eceb1d5fe42b1b779e115a0144a5d9639d3753f
Change-Id: I833812e04a4649283bdc619ad5278217aa0e3c23
Signed-off-by: Goutham Pacha Ravi <gouthampravi@gmail.com>

.zuul.yaml

@@ -17,10 +17,6 @@
             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
         - manila-tempest-minimal-dsvm-cephfs-native:
@@ -35,10 +31,6 @@
         - manila-tempest-minimal-lvm-ipv6-only
         - manila-grenade:
             voting: false
-        - manila-rally-no-ss:
-            voting: false
-        - manila-rally-ss:
-            voting: false
         - openstack-tox-pylint:
             voting: false
             timeout: 5400
@@ -53,8 +45,6 @@
     experimental:
       jobs:
         - manila-tempest-dsvm-glusterfs-native
-        - manila-tempest-dsvm-glusterfs-nfs-heketi
-        - manila-tempest-dsvm-glusterfs-native-heketi
         - manila-tempest-minimal-dsvm-cephfs-native-centos-7
         - manila-tempest-minimal-dsvm-cephfs-nfs-centos-7
         - tripleo-ci-centos-7-scenario004-standalone
@@ -88,45 +78,6 @@
       - openstack/python-manilaclient
       - openstack/manila-tempest-plugin
 
-- job:
-    name: manila-tempest-dsvm-container-scenario-custom-image
-    parent: manila-tempest-base
-    run: playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml
-    post-run: playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/manila
-      - openstack/manila-image-elements
-      - openstack/manila-tempest-plugin
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: manila-tempest-dsvm-generic-no-share-servers
-    parent: manila-tempest-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
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/manila
-      - openstack/manila-image-elements
-      - openstack/manila-tempest-plugin
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: manila-tempest-dsvm-generic-scenario-custom-image
-    parent: manila-tempest-base
-    run: playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml
-    post-run: playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/manila
-      - openstack/manila-image-elements
-      - openstack/manila-tempest-plugin
-      - openstack/python-manilaclient
-      - openstack/tempest
-
 - job:
     name: manila-tempest-dsvm-glusterfs-native
     parent: manila-tempest-base
@@ -140,19 +91,6 @@
       - openstack/python-manilaclient
       - openstack/tempest
 
-- job:
-    name: manila-tempest-dsvm-glusterfs-native-heketi
-    parent: manila-tempest-base
-    run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml
-    post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml
-    required-projects:
-      - openstack/devstack-gate
-      - x/devstack-plugin-glusterfs
-      - openstack/manila
-      - openstack/manila-tempest-plugin
-      - openstack/python-manilaclient
-      - openstack/tempest
-
 - job:
     name: manila-tempest-dsvm-glusterfs-nfs
     parent: manila-tempest-base
@@ -166,32 +104,6 @@
       - openstack/python-manilaclient
       - openstack/tempest
 
-- job:
-    name: manila-tempest-dsvm-glusterfs-nfs-heketi
-    parent: manila-tempest-base
-    run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml
-    post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml
-    required-projects:
-      - openstack/devstack-gate
-      - x/devstack-plugin-glusterfs
-      - openstack/manila
-      - openstack/manila-tempest-plugin
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: manila-tempest-dsvm-hdfs
-    parent: manila-tempest-base
-    run: playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml
-    post-run: playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml
-    required-projects:
-      - openstack/devstack-gate
-      - x/devstack-plugin-hdfs
-      - openstack/manila
-      - openstack/manila-tempest-plugin
-      - openstack/python-manilaclient
-      - openstack/tempest
-
 - job:
     name: manila-tempest-dsvm-mysql-generic
     parent: manila-tempest-base
@@ -218,19 +130,6 @@
       - openstack/python-manilaclient
       - openstack/tempest
 
-- job:
-    name: manila-tempest-dsvm-postgres-generic-singlebackend
-    parent: manila-tempest-base
-    run: playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
-    post-run: playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/manila
-      - openstack/manila-image-elements
-      - openstack/manila-tempest-plugin
-      - openstack/python-manilaclient
-      - openstack/tempest
-
 - job:
     name: manila-tempest-dsvm-postgres-zfsonlinux
     parent: manila-tempest-base
@@ -366,34 +265,6 @@
     required-projects:
       - openstack/tempest
 
-- job:
-    name: manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7
-    parent: manila-tempest-base
-    run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml
-    post-run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/post.yaml
-    nodeset: legacy-centos-7
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/devstack-plugin-ceph
-      - openstack/manila
-      - openstack/manila-tempest-plugin
-      - openstack/python-manilaclient
-      - openstack/tempest
-
-- job:
-    name: manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7
-    parent: manila-tempest-base
-    run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml
-    post-run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/post.yaml
-    nodeset: legacy-centos-7
-    required-projects:
-      - openstack/devstack-gate
-      - openstack/devstack-plugin-ceph
-      - openstack/manila
-      - openstack/manila-tempest-plugin
-      - openstack/python-manilaclient
-      - openstack/tempest
-
 - job:
     name: manila-tox-genconfig
     parent: openstack-tox
@@ -404,25 +275,3 @@
     post-run: playbooks/manila-tox-genconfig/post.yaml
     vars:
       tox_envlist: genconfig
-
-- job:
-    name: manila-rally-no-ss
-    parent: rally-task-manila-no-ss
-    irrelevant-files: *tempest-irrelevant-files
-    vars:
-      rally_task: rally-jobs/rally-manila-no-ss.yaml
-      devstack_plugins:
-        rally-openstack: https://opendev.org/openstack/rally-openstack
-    required-projects:
-      - openstack/rally-openstack
-
-- job:
-    name: manila-rally-ss
-    parent: rally-task-manila-ss
-    irrelevant-files: *tempest-irrelevant-files
-    vars:
-      rally_task: rally-jobs/rally-manila.yaml
-      devstack_plugins:
-        rally-openstack: https://opendev.org/openstack/rally-openstack
-    required-projects:
-      - openstack/rally-openstack

contrib/ci/post_test_hook.sh

@@ -54,23 +54,6 @@ else
 fi
 iniset $TEMPEST_CONFIG share backend_names $BACKENDS_NAMES
 
-# If testing a stable branch, we need to ensure we're testing with supported
-# API micro-versions; so set the versions from code if we're not testing the
-# master branch. If we're testing master, we'll allow manila-tempest-plugin
-# (which is branchless) tell us what versions it wants to test.
-if [[ $ZUUL_BRANCH != "master" ]]; then
-    # Grab the supported API micro-versions from the code
-    _API_VERSION_REQUEST_PATH=$BASE/new/manila/manila/api/openstack/api_version_request.py
-    _DEFAULT_MIN_VERSION=$(awk '$0 ~ /_MIN_API_VERSION = /{print $3}' $_API_VERSION_REQUEST_PATH)
-    _DEFAULT_MAX_VERSION=$(awk '$0 ~ /_MAX_API_VERSION = /{print $3}' $_API_VERSION_REQUEST_PATH)
-    # Override the *_api_microversion tempest options if present
-    MANILA_TEMPEST_MIN_API_MICROVERSION=${MANILA_TEMPEST_MIN_API_MICROVERSION:-$_DEFAULT_MIN_VERSION}
-    MANILA_TEMPEST_MAX_API_MICROVERSION=${MANILA_TEMPEST_MAX_API_MICROVERSION:-$_DEFAULT_MAX_VERSION}
-    # Set these options in tempest.conf
-    iniset $TEMPEST_CONFIG share min_api_microversion $MANILA_TEMPEST_MIN_API_MICROVERSION
-    iniset $TEMPEST_CONFIG share max_api_microversion $MANILA_TEMPEST_MAX_API_MICROVERSION
-fi
-
 # Set two retries for CI jobs
 iniset $TEMPEST_CONFIG share share_creation_retry_number 2
 
@@ -362,11 +345,9 @@ echo "Manila service details"
 source $BASE/new/devstack/openrc admin admin
 manila service-list
 
-echo "Running tempest manila test suites"
 cd $BASE/new/tempest/
-# List plugins in logs to enable debugging
+echo "Running manila tempest tests:"
-sudo -H -u $USER tempest list-plugins
+tox -evenv-tempest -- tempest run -r $MANILA_TESTS -w $MANILA_TEMPEST_CONCURRENCY
-sudo -H -u $USER tempest run -r $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY
 RETVAL=$?
 cd -
 
@@ -393,7 +374,7 @@ if [[ "$DRIVER" == "dummy" ]]; then
 
     echo "Running tempest manila test suites for DHSS=False mode"
     cd $BASE/new/tempest/
-    sudo -H -u $USER tempest run -r  $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY
+    tox -evenv-tempest -- tempest run -r $MANILA_TESTS -w $MANILA_TEMPEST_CONCURRENCY
     RETVAL2=$?
     cd -
     save_tempest_results 2

devstack/plugin.sh

@@ -943,6 +943,10 @@ function update_tempest {
         iniset $TEMPEST_CONFIG identity alt_password $ADMIN_PASSWORD
         iniset $TEMPEST_CONFIG identity alt_tenant_name ${ALT_TENANT_NAME:-"alt_demo"}
         iniset $TEMPEST_CONFIG identity alt_domain_name $ADMIN_DOMAIN_NAME
+
+        # Max API micro-version for tempest tests
+        iniset $TEMPEST_CONFIG share min_api_microversion 2.0
+        iniset $TEMPEST_CONFIG share max_api_microversion 2.51
     fi
 }
 

playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml

@@ -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

playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml

@@ -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/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/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 https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export 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
-          export PROJECTS="openstack/manila-image-elements $PROJECTS"
-
-          export ENABLED_SERVICES=tempest
-          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
-          export MANILA_ALLOW_NAS_SERVER_PORTS_ON_HOST=True
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-          export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
-
-          function pre_test_hook {
-              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
-              image_name=$(cat ./IMAGE_NAME)
-              export MANILA_SERVICE_IMAGE_URL="file://$(pwd)/$image_name"
-              export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
-
-              # Return back to execution dir
-              cd $current_dir
-
-              # '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 }}'

playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml

@@ -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

playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml

@@ -1,94 +0,0 @@
-- hosts: all
-  name: Autoconverted job 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/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/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 https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_POSTGRES=0
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-
-          export ENABLED_SERVICES=tempest
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-          export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
-
-          export DEVSTACK_GATE_USE_PYTHON3=True
-
-          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
-
-          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 \
-                  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 }}'

playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml

@@ -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

playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml

@@ -1,107 +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/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/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 https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
-
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export 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
-          export PROJECTS="openstack/manila-image-elements $PROJECTS"
-
-          export ENABLED_SERVICES=tempest
-          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-          export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
-
-          function pre_test_hook {
-              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
-              image_name=$(cat ./IMAGE_NAME)
-              export MANILA_SERVICE_IMAGE_URL="file://$(pwd)/$image_name"
-              export MANILA_SERVICE_IMAGE_NAME=$(basename -s .tar.gz $(basename -s .qcow2 $image_name))
-
-              # Return back to execution dir
-              cd $current_dir
-
-              # '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 }}'

playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml

@@ -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

playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml

@@ -1,83 +0,0 @@
-- hosts: all
-  name: Autoconverted job 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/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/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 https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
-
-          # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
-          enable_plugin devstack-plugin-glusterfs https://opendev.org/x/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="x/devstack-plugin-glusterfs $PROJECTS"
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-          export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
-          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
-
-          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 \
-                  glusterfs-heketi \
-                  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 }}'

playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml

@@ -30,7 +30,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+          TEMPEST_PLUGINS='/opt/stack/new/manila-tempest-plugin'
 
           # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
           enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs

playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml

@@ -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

playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml

@@ -1,84 +0,0 @@
-- hosts: all
-  name: Autoconverted job 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/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/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 https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
-
-          # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
-          enable_plugin devstack-plugin-glusterfs https://opendev.org/x/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="x/devstack-plugin-glusterfs $PROJECTS"
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-          export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
-          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
-
-          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 \
-                  glusterfs-nfs-heketi \
-                  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 }}'

playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml

@@ -30,7 +30,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+          TEMPEST_PLUGINS='/opt/stack/new/manila-tempest-plugin'
 
           # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
           enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs
@@ -41,6 +41,7 @@
           # 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'

playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml

@@ -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

playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml

@@ -1,74 +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/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/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 https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
-
-          # Enable devstack-plugin-hdfs plugin, to install and configure HDFS.
-          enable_plugin devstack-plugin-hdfs https://opendev.org/x/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="x/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
-          export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
-          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
-
-          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 }}'

playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml

@@ -30,7 +30,8 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+          TEMPEST_PLUGINS='/opt/stack/new/manila-tempest-plugin'
+
           EOF
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'

playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml

@@ -30,7 +30,8 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+          TEMPEST_PLUGINS='/opt/stack/new/manila-tempest-plugin'
+
           EOF
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'

playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml

@@ -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

playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml

@@ -1,92 +0,0 @@
-- hosts: all
-  name: Autoconverted job 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/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/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 https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
-          EOF
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_NEUTRON=1
-          export DEVSTACK_GATE_POSTGRES=1
-          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-
-          export ENABLED_SERVICES=tempest
-
-          # Keep localrc to be able to set some vars in pre_test_hook
-          export KEEP_LOCALRC=1
-          export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
-          export MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=False
-
-          export DEVSTACK_GATE_USE_PYTHON3=True
-
-          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 \
-                  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 }}'

playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml

@@ -30,7 +30,8 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+          TEMPEST_PLUGINS='/opt/stack/new/manila-tempest-plugin'
+
           EOF
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'

playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml

@@ -30,7 +30,8 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+          TEMPEST_PLUGINS='/opt/stack/new/manila-tempest-plugin'
+
           EOF
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'

playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml

@@ -64,7 +64,7 @@
           [[local|localrc]]
           SKIP_EPEL_INSTALL=True
           enable_plugin manila https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+          TEMPEST_PLUGINS='/opt/stack/new/manila-tempest-plugin'
 
           enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph
 
@@ -86,6 +86,7 @@
           # Set native or NFS variant of ceph driver
           MANILA_CEPH_DRIVER=cephfsnative
 
+
           EOF
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'

playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml

@@ -30,7 +30,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+          TEMPEST_PLUGINS='/opt/stack/new/manila-tempest-plugin'
 
           enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph
 
@@ -52,6 +52,8 @@
           # Set native or NFS variant of ceph driver
           MANILA_CEPH_DRIVER=cephfsnative
 
+
+
           EOF
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'

playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml

@@ -64,7 +64,7 @@
           [[local|localrc]]
           SKIP_EPEL_INSTALL=True
           enable_plugin manila https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+          TEMPEST_PLUGINS='/opt/stack/new/manila-tempest-plugin'
 
           enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph
 

playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml

@@ -30,7 +30,7 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+          TEMPEST_PLUGINS='/opt/stack/new/manila-tempest-plugin'
           enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing
           enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin
           enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph

playbooks/legacy/manila-tempest-minimal-dsvm-dummy-py2/run.yaml

@@ -30,7 +30,8 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+          TEMPEST_PLUGINS='/opt/stack/new/manila-tempest-plugin'
+
           EOF
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'

playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml

@@ -30,7 +30,8 @@
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
           enable_plugin manila https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+          TEMPEST_PLUGINS='/opt/stack/new/manila-tempest-plugin'
+
           EOF
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'

playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml

@@ -31,11 +31,12 @@
           [[local|localrc]]
           SKIP_EPEL_INSTALL=True
           enable_plugin manila https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+          TEMPEST_PLUGINS='/opt/stack/new/manila-tempest-plugin'
           enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing
           enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin
           SERVICE_IP_VERSION=6
           SERVICE_HOST=""
+
           EOF
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
@@ -60,15 +61,12 @@
           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
+          OVERRIDE_ENABLED_SERVICES+=,placement-api,placement-client
           # Enable neutron for scenario tests
           OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt
           # Enable tls-proxy
           OVERRIDE_ENABLED_SERVICES+=,tls-proxy
 
-          # Enable mandatory placement services for nova starting with ocata
-          if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
-               OVERRIDE_ENABLED_SERVICES+=,placement-api,placement-client
-          fi
           export OVERRIDE_ENABLED_SERVICES
 
           # Keep localrc to be able to set some vars in pre_test_hook

playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml

@@ -31,9 +31,10 @@
           [[local|localrc]]
           SKIP_EPEL_INSTALL=True
           enable_plugin manila https://opendev.org/openstack/manila
-          enable_plugin manila-tempest-plugin https://opendev.org/openstack/manila-tempest-plugin
+          TEMPEST_PLUGINS='/opt/stack/new/manila-tempest-plugin'
           enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing
           enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin
+
           EOF
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
@@ -58,15 +59,12 @@
           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
+          OVERRIDE_ENABLED_SERVICES+=,placement-api,placement-client
           # Enable neutron for scenario tests
           OVERRIDE_ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-l3,q-agt
           # Enable tls-proxy
           OVERRIDE_ENABLED_SERVICES+=,tls-proxy
 
-          # Enable mandatory placement services for nova starting with ocata
-          if [[ "stable/newton" != $ZUUL_BRANCH ]]; then
-               OVERRIDE_ENABLED_SERVICES+=,placement-api,placement-client
-          fi
           export OVERRIDE_ENABLED_SERVICES
 
           # Keep localrc to be able to set some vars in pre_test_hook

playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/post.yaml

@@ -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

playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml

@@ -1,109 +0,0 @@
-- hosts: all
-  name: Autoconverted job 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/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    # Install centos-release-openstack-* needed for rabbitmq-server
-    - name: Add centos-release-openstack-pike support
-      become: yes
-      yum:
-        name: centos-release-openstack-pike
-        state: present
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          SKIP_EPEL_INSTALL=True
-
-          # 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 https://opendev.org/openstack/manila
-
-          enable_plugin devstack-plugin-ceph https://opendev.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
-          export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
-
-          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 }}'

playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/post.yaml

@@ -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

playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml

@@ -1,109 +0,0 @@
-- hosts: all
-  name: Autoconverted job 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/devstack-gate
-              dest: devstack-gate
-          EOF
-          /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://opendev.org \
-              openstack/devstack-gate
-        executable: /bin/bash
-        chdir: '{{ ansible_user_dir }}/workspace'
-      environment: '{{ zuul | zuul_legacy_vars }}'
-
-    # Install centos-release-openstack-* needed for rabbitmq-server
-    - name: Add centos-release-openstack-pike support
-      become: yes
-      yum:
-        name: centos-release-openstack-pike
-        state: present
-
-    - shell:
-        cmd: |
-          set -e
-          set -x
-          cat << 'EOF' >>"/tmp/dg-local.conf"
-          [[local|localrc]]
-          SKIP_EPEL_INSTALL=True
-
-          # 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 https://opendev.org/openstack/manila
-
-          enable_plugin devstack-plugin-ceph https://opendev.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
-          export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"
-
-          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 }}'

rally-jobs/rally-manila-no-ss.yaml

@@ -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

rally-jobs/rally-manila.yaml

@@ -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