From ed316557e9b7d33277c2b346a7251ef391f771db Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Thu, 20 May 2021 14:15:14 -0500 Subject: [PATCH] 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 allow zuulv3 style jobs elsewhere [1] use the right api versions when testing against this stable branch, we enhance the devstack plugin.sh script to set api versions as tempest configuration options. Alongside these changes, we can perform a much needed test job cleanup by eliminating some jobs we don't have the bandwidth to maintain: - manila-tempest-dsvm-postgres-generic-singlebackend Single backend jobs are not very useful - the job sets up a single backend in a multibackend style. We've dropped this from future branches, and we don't expect this job to catch any regressions that other jobs will miss. - manila-tempest-dsvm-generic-no-share-servers This job's been failing; and wasting CI resources. We have other DHSS=False reference drivers (CephFS native/nfs, ZFSOnLinux, LVM) where we test the driver mode sufficiently. - manila-tempest-dsvm-glusterfs-nfs-heketi and manila-tempest-dsvm-glusterfs-native-heketi these were in the experimental queue, unmaintained - manila-tempest-dsvm-container-scenario-custom-image and manila-tempest-dsvm-generic-scenario-custom-image New zuulv3 style jobs in the manila-image-elements project replace these jobs [2]. [1] https://review.opendev.org/c/openstack/manila-tempest-plugin/+/725692 [2] https://opendev.org/openstack/manila-image-elements/src/commit/9c00e86d17a3487c9467dbedfe09a0d5623974b5/zuul.d/manila-image-elements-jobs.yaml Closes-Bug: #1928880 Depends-On: I2eceb1d5fe42b1b779e115a0144a5d9639d3753f Change-Id: I6c7db2286d544ff8156926e07efd57628cfdc9ff Signed-off-by: Goutham Pacha Ravi --- contrib/ci/post_test_hook.sh | 25 +--- devstack/plugin.sh | 4 + .../post.yaml | 15 --- .../run.yaml | 108 --------------- .../post.yaml | 15 --- .../run.yaml | 94 ------------- .../post.yaml | 15 --- .../run.yaml | 107 --------------- .../post.yaml | 15 --- .../run.yaml | 83 ------------ .../run.yaml | 2 +- .../post.yaml | 15 --- .../run.yaml | 84 ------------ .../run.yaml | 2 +- .../legacy/manila-tempest-dsvm-hdfs/post.yaml | 15 --- .../legacy/manila-tempest-dsvm-hdfs/run.yaml | 74 ----------- .../run.yaml | 22 +--- .../run.yaml | 2 +- .../post.yaml | 15 --- .../run.yaml | 92 ------------- .../run.yaml | 2 +- .../manila-tempest-dsvm-scenario/run.yaml | 2 +- .../run.yaml | 2 +- .../run.yaml | 2 +- .../run.yaml | 2 +- .../run.yaml | 2 +- .../run.yaml | 2 +- .../run-ipv6.yaml | 2 +- .../manila-tempest-minimal-dsvm-lvm/run.yaml | 2 +- .../post.yaml | 15 --- .../run.yaml | 109 --------------- .../post.yaml | 28 ---- .../run.yaml | 109 --------------- zuul.d/grenade-jobs.yaml | 1 + zuul.d/project.yaml | 124 ------------------ 35 files changed, 23 insertions(+), 1185 deletions(-) delete mode 100644 playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/post.yaml delete mode 100644 playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml diff --git a/contrib/ci/post_test_hook.sh b/contrib/ci/post_test_hook.sh index 074a5429ed..05c279e600 100755 --- a/contrib/ci/post_test_hook.sh +++ b/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 @@ -363,11 +346,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 -sudo -H -u $USER tempest list-plugins -sudo -H -u $USER tempest run -r $MANILA_TESTS --concurrency=$MANILA_TEMPEST_CONCURRENCY +echo "Running manila tempest tests:" +tox -evenv-tempest -- tempest run -r $MANILA_TESTS -w $MANILA_TEMPEST_CONCURRENCY RETVAL=$? cd - @@ -394,7 +375,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 diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f0c7ead9a3..eb1a8de80f 100755 --- a/devstack/plugin.sh +++ b/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.55 fi } diff --git a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml deleted file mode 100644 index 6d6c37d1a6..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml +++ /dev/null @@ -1,108 +0,0 @@ -- hosts: all - name: Autoconverted job legacy-manila-tempest-dsvm-container-scenario-custom-image - from old job gate-manila-tempest-dsvm-container-scenario-custom-image-ubuntu-xenial-nv - tasks: - - - name: Ensure legacy workspace directory - file: - path: '{{ ansible_user_dir }}/workspace' - state: directory - - - shell: - cmd: | - set -e - set -x - cat > clonemap.yaml << EOF - clonemap: - - name: openstack/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 }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml deleted file mode 100644 index 5f85edc476..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml +++ /dev/null @@ -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 }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml deleted file mode 100644 index 70a6324e95..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml +++ /dev/null @@ -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 }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml deleted file mode 100644 index 1c9c66cde2..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml +++ /dev/null @@ -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 }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml index 077366080a..5af8ac840d 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml +++ b/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 diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml deleted file mode 100644 index 5ef8d622e5..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml +++ /dev/null @@ -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 }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml index bf564bd8f7..c2343463cf 100644 --- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml +++ b/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 diff --git a/playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml b/playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml b/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml deleted file mode 100644 index 4863f065db..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml +++ /dev/null @@ -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 }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml index e49f18d56e..c117a7696a 100644 --- a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/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' EOF executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' @@ -44,7 +44,7 @@ export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_POSTGRES=0 export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient" - + export DEVSTACK_GATE_TEMPEST=1 export ENABLED_SERVICES=tempest # Keep localrc to be able to set some vars in pre_test_hook @@ -63,27 +63,11 @@ 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 + export -f pre_test_hook cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml index b89d067c29..62ace80446 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-container/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' EOF executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml deleted file mode 100644 index f77fdabe40..0000000000 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml +++ /dev/null @@ -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 }}' diff --git a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml index 0d14bca245..3ea1313592 100644 --- a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/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' EOF executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' diff --git a/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml b/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml index c7ea443b96..490d7be577 100644 --- a/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml +++ b/playbooks/legacy/manila-tempest-dsvm-scenario/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' EOF executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml index 80659893f1..6c44b5eeac 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml @@ -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 diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml index 70c002c034..71ab8922a8 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml +++ b/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 diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml index a48cf67d05..53db655731 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml @@ -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 diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml index 1428c75971..a15ee9168a 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml +++ b/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 devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml index 293ff20616..de23fa2191 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/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' EOF executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml index ec5991bfff..f6338b5a9f 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run-ipv6.yaml @@ -31,7 +31,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 neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing SERVICE_IP_VERSION=6 SERVICE_HOST="" diff --git a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml index e06901d728..db97bf47da 100644 --- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml +++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm/run.yaml @@ -31,7 +31,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 neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing EOF executable: /bin/bash diff --git a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/post.yaml b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/post.yaml deleted file mode 100644 index e07f5510ae..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/post.yaml +++ /dev/null @@ -1,15 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs diff --git a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml deleted file mode 100644 index 27e5f2e9c8..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml +++ /dev/null @@ -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 }}' diff --git a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/post.yaml b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/post.yaml deleted file mode 100644 index 514af465bd..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/post.yaml +++ /dev/null @@ -1,28 +0,0 @@ -- hosts: primary - tasks: - - - name: Copy files from {{ ansible_user_dir }}/workspace/ on node - synchronize: - src: '{{ ansible_user_dir }}/workspace/' - dest: '{{ zuul.executor.log_root }}' - mode: pull - copy_links: true - verify_host: true - rsync_opts: - - --include=/logs/** - - --include=*/ - - --exclude=* - - --prune-empty-dirs - - - name: Copy ganesha config and logs - synchronize: - src: '{{ item.src }}' - dest: '{{ zuul.executor.log_root }}/{{ item.dest }}' - mode: pull - copy_links: true - verify_host: true - with_items: - - src: /etc/ganesha - dest: logs/etc/ - - src: /var/log/ganesha - dest: logs/ diff --git a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml deleted file mode 100644 index b4811d1a64..0000000000 --- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml +++ /dev/null @@ -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 }}' diff --git a/zuul.d/grenade-jobs.yaml b/zuul.d/grenade-jobs.yaml index 30af7fd918..b6df095708 100644 --- a/zuul.d/grenade-jobs.yaml +++ b/zuul.d/grenade-jobs.yaml @@ -85,6 +85,7 @@ multitenancy_enabled: False backend_names: LONDON,PARIS multi_backend: true + max_api_microversion: 2.55 tempest_plugins: - manila-tempest-plugin tempest_test_regex: ^manila_tempest_tests.tests.api diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 9b8c412377..dda6bf7ff3 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -16,10 +16,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: @@ -51,8 +47,6 @@ - manila-tempest-minimal-lvm-ipv6-only experimental: jobs: - - 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 @@ -73,44 +67,6 @@ - ^tools/.*$ - ^tox.ini$ -- 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 @@ -125,19 +81,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 @@ -151,32 +94,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 @@ -203,19 +120,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 @@ -329,34 +233,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