From ca6a1438e150ba7ce9dd997c6bddaf3a6f2e19f2 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Fri, 11 Sep 2020 11:36:32 +0200 Subject: [PATCH] Port several legacy tempest jobs to Zuul v3 - cinder-tempest-lvm-multibackend is the simple LVM multibackend job and replaces legacy-tempest-dsvm-lvm-multibackend. - replace cinder-tempest-dsvm-lvm-lio-barbican with cinder-tempest-dsvm-lvm-lio-barbican provided by cinder-tempest-plugins; - replace legacy-tempest-dsvm-full-devstack-plugin-nfs with devstack-plugin-nfs-tempest-full, now provided by devstack-plugin-nfs. The original review added a new cinder-plugin-ceph-tempest job which is not relevant here because cinderlib is not available on stein. It also removed legacy-tempest-dsvm-zeromq-multibackend, which was deleted in the meantime. Finally, in stein and earlier branches this change replaces the old dependency on a cinder-tempest-plugin fix to the cinderlib functional test runner, but on a refactoring of cinder-tempest-plugin which disables cinderlib testing for those older branches. Conflicts: .zuul.yaml playbooks/legacy/cinder-tempest-dsvm-lvm-lio-barbican/run.yaml playbooks/tempest-and-cinderlib-run.yaml - .zuul.yaml in master contains new jobs (for example, the imported legacy grenade jobs, which haven't been backported so far); - playbooks/legacy/cinder-tempest-dsvm-lvm-lio-barbican/run.yaml is not needed anymore; - playbooks/tempest-and-cinderlib-run.yaml is not relevant as cinderlib is supported from train only. Depends-On: https://review.opendev.org/c/openstack/cinder-tempest-plugin/+/778448 Change-Id: Icdafaf55494b6dd74ec31c3572d7344fcc028166 (cherry picked from commit 9ab1ff0059dc324ea73d0444103fa71c97fb517a) (cherry picked from commit fc59ea9e6eadda2bce2f77859e5043656c86a3ec) --- .zuul.yaml | 42 ++++++---- .../post.yaml | 15 ---- .../run.yaml | 84 ------------------- 3 files changed, 24 insertions(+), 117 deletions(-) delete mode 100644 playbooks/legacy/cinder-tempest-dsvm-lvm-lio-barbican/post.yaml delete mode 100644 playbooks/legacy/cinder-tempest-dsvm-lvm-lio-barbican/run.yaml diff --git a/.zuul.yaml b/.zuul.yaml index 9497e39ca5a..0b1d58c982e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -11,7 +11,6 @@ - release-notes-jobs-python3 check: jobs: - - cinder-tempest-dsvm-lvm-lio-barbican - cinder-tox-bandit-baseline: voting: false - openstack-tox-functional-py36: @@ -49,12 +48,14 @@ - openstack-tox-functional: voting: false irrelevant-files: *functional-irrelevant-files + - cinder-tempest-plugin-lvm-lio-barbican: + irrelevant-files: *gate-irrelevant-files - legacy-grenade-dsvm-cinder-mn-sub-volbak: irrelevant-files: *gate-irrelevant-files - - legacy-tempest-dsvm-lvm-multibackend: + - cinder-tempest-lvm-multibackend: voting: false irrelevant-files: *gate-irrelevant-files - - legacy-tempest-dsvm-full-devstack-plugin-nfs: + - devstack-plugin-nfs-tempest-full: voting: false irrelevant-files: *gate-irrelevant-files - neutron-grenade: @@ -103,21 +104,6 @@ - tempest-full-py3-opensuse15: irrelevant-files: *gate-irrelevant-files -- job: - # Previously named legacy-tempest-dsvm-full-lio - name: cinder-tempest-dsvm-lvm-lio-barbican - parent: legacy-dsvm-base - run: playbooks/legacy/cinder-tempest-dsvm-lvm-lio-barbican/run.yaml - post-run: playbooks/legacy/cinder-tempest-dsvm-lvm-lio-barbican/post.yaml - timeout: 10800 - required-projects: - - openstack/devstack-gate - - openstack/barbican - - openstack/python-barbicanclient - - openstack/tempest - - openstack/os-brick - irrelevant-files: *gate-irrelevant-files - - job: # Security testing for known issues name: cinder-tox-bandit-baseline @@ -139,3 +125,23 @@ rally_task: rally-jobs/cinder.yaml required-projects: - openstack/rally-openstack + +- job: + name: cinder-tempest-lvm-multibackend + parent: devstack-tempest + description: | + Cinder tempest job based on LVM and multiple backends. + Former names for this job were: + * legacy-tempest-dsvm-lvm-multibackend + timeout: 10800 + required-projects: + - opendev.org/openstack/cinder-tempest-plugin + vars: + tox_envlist: all + tempest_test_regex: '(?!.*\[.*\bslow\b.*\])(^tempest\.(api|scenario)|(^cinder_tempest_plugin))' + tempest_plugins: + - cinder-tempest-plugin + devstack_localrc: + CINDER_ENABLED_BACKENDS: 'lvm:lvmdriver-1,lvm:lvmdriver-2' + CINDER_VOLUME_CLEAR: none + irrelevant-files: *gate-irrelevant-files diff --git a/playbooks/legacy/cinder-tempest-dsvm-lvm-lio-barbican/post.yaml b/playbooks/legacy/cinder-tempest-dsvm-lvm-lio-barbican/post.yaml deleted file mode 100644 index e07f5510ae7..00000000000 --- a/playbooks/legacy/cinder-tempest-dsvm-lvm-lio-barbican/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/cinder-tempest-dsvm-lvm-lio-barbican/run.yaml b/playbooks/legacy/cinder-tempest-dsvm-lvm-lio-barbican/run.yaml deleted file mode 100644 index f6e3ad880e0..00000000000 --- a/playbooks/legacy/cinder-tempest-dsvm-lvm-lio-barbican/run.yaml +++ /dev/null @@ -1,84 +0,0 @@ -- hosts: all - name: Test the LVM driver with the LIO iSCSI target and Barbican - 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]] - CINDER_ISCSI_HELPER=lioadm - CINDER_LVM_TYPE=thin - enable_service barbican - enable_plugin barbican https://opendev.org/openstack/barbican - - # Test with local file locks - CINDER_COORDINATION_URL='file://$state_path' - - EOF - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}' - - - shell: - cmd: | - set -e - set -x - export PROJECTS="openstack/barbican $PROJECTS" - export PROJECTS="openstack/python-barbicanclient $PROJECTS" - export PYTHONUNBUFFERED=true - if [ "$ZUUL_BRANCH" == "master" ]; then - # Use os-brick head for master, use os-brick from - # pip for stable branches. - export DEVSTACK_PROJECT_FROM_GIT=os-brick - fi - export DEVSTACK_GATE_TEMPEST=1 - export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 - # As we are setting DEVSTACK_GATE_TEMPEST_ALL_PLUGINS, we need to add - # the regex to limit the tests to the same as a tempest -efull would - # run. - DEVSTACK_GATE_TEMPEST_REGEX='(^tempest\.(api|scenario\.test_encrypted_cinder_volumes|scenario\.test_volume|scenario\.test_shelve_instance)|(^cinder\.tests.tempest))' - DEVSTACK_GATE_TEMPEST_REGEX+='(?!.*VolumesSnapshotTestJSON.test_snapshot_backup)' - DEVSTACK_GATE_TEMPEST_REGEX+='(?!.*VolumesBackupsAdminTest.test_volume_backup_export_import)' - DEVSTACK_GATE_TEMPEST_REGEX+='(?!.*VolumesBackupsAdminTest.test_volume_backup_reset_status)' - DEVSTACK_GATE_TEMPEST_REGEX+='(?!.*VolumesBackupsTest.test_backup_create_attached_volume)' - DEVSTACK_GATE_TEMPEST_REGEX+='(?!.*VolumesBackupsTest.test_backup_create_and_restore_to_an_existing_volume)' - DEVSTACK_GATE_TEMPEST_REGEX+='(?!.*VolumesBackupsTest.test_bootable_volume_backup_and_restore)' - DEVSTACK_GATE_TEMPEST_REGEX+='(?!.*VolumesBackupsTest.test_incremental_backup)' - DEVSTACK_GATE_TEMPEST_REGEX+='(?!.*VolumesBackupsTest.test_volume_backup_create_get_detailed_list_restore_delete)' - DEVSTACK_GATE_TEMPEST_REGEX+='(?!.*VolumesBackupsTest.test_volume_snapshot_backup)' - DEVSTACK_GATE_TEMPEST_REGEX+='(?!.*VolumesBackupsV39Test.test_update_backup)' - DEVSTACK_GATE_TEMPEST_REGEX+='(?!.*TestVolumeBackupRestore.test_volume_backup_restore)' - export DEVSTACK_GATE_TEMPEST_REGEX - export BRANCH_OVERRIDE=default - if [ "$BRANCH_OVERRIDE" != "default" ] ; then - export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE - fi - - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - executable: /bin/bash - chdir: '{{ ansible_user_dir }}/workspace' - environment: '{{ zuul | zuul_legacy_vars }}'