Merge "Add stable/zed jobs on master gate"
diff --git a/.zuul.yaml b/.zuul.yaml
index f5ee987..85e15bc 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -8,7 +8,11 @@
- cinder-tempest-plugin-lvm-lio-barbican
- cinder-tempest-plugin-lvm-lio-barbican-centos-9-stream:
voting: false
- - cinder-tempest-plugin-lvm-tgt-barbican
+ # FIXME: the tgt job is broken on jammy, and we may be removing tgt
+ # support anyway. So make it non-voting until we figure out what to
+ # do about this, which should be at the March 2023 virtual PTG.
+ - cinder-tempest-plugin-lvm-tgt-barbican:
+ voting: false
- nova-ceph-multistore:
voting: false
- cinder-tempest-plugin-cbak-ceph
@@ -27,7 +31,8 @@
gate:
jobs:
- cinder-tempest-plugin-lvm-lio-barbican
- - cinder-tempest-plugin-lvm-tgt-barbican
+ # FIXME: no sense running a non-voting gate job. See comment above.
+ # - cinder-tempest-plugin-lvm-tgt-barbican
- cinder-tempest-plugin-cbak-ceph
experimental:
jobs:
@@ -144,13 +149,11 @@
name: cinder-tempest-plugin-lvm-barbican-base
description: |
This is a base job for lvm with lio & tgt targets
- with cinderlib tests to run on stable/train to stable/victoria
+ with cinderlib tests to run on stable/victoria
testing. To run on those stable branches that are using tempest
26.1.0 (which is set in the devstack stackrc file), we must
use cinder-tempest-plugin compatible version 1.3.0.
branches:
- - stable/train
- - stable/ussuri
- stable/victoria
parent: cinder-tempest-plugin-lvm-barbican-base-abstract
roles:
@@ -171,6 +174,26 @@
name: cinder-tempest-plugin-lvm-barbican-base
description: |
This is a base job for lvm with lio & tgt targets
+ for stable/train and stable/ussuri testing.
+ To run on those stable branches that are using tempest
+ 26.1.0 (which is set in the devstack stackrc file), we must
+ use cinder-tempest-plugin compatible version 1.3.0.
+ We no longer test cinderlib because it's EOL on these branches.
+ branches:
+ - stable/train
+ - stable/ussuri
+ parent: cinder-tempest-plugin-lvm-barbican-base-abstract
+ required-projects:
+ - opendev.org/openstack/cinderlib
+ - name: opendev.org/openstack/cinder-tempest-plugin
+ override-checkout: 1.3.0
+ vars:
+ tempest_test_exclude_list: '{{ ansible_user_dir }}/{{ zuul.projects["opendev.org/openstack/tempest"].src_dir }}/tools/tempest-integrated-gate-storage-exclude-list.txt'
+
+- job:
+ name: cinder-tempest-plugin-lvm-barbican-base
+ description: |
+ This is a base job for lvm with lio & tgt targets
branches: ^(?=stable/(ocata|pike|queens|rocky|stein)).*$
parent: cinder-tempest-plugin-lvm-barbican-base-abstract
required-projects:
diff --git a/cinder_tempest_plugin/rbac/v3/test_capabilities.py b/cinder_tempest_plugin/rbac/v3/test_capabilities.py
index 7024e30..62f9b58 100644
--- a/cinder_tempest_plugin/rbac/v3/test_capabilities.py
+++ b/cinder_tempest_plugin/rbac/v3/test_capabilities.py
@@ -81,3 +81,7 @@
class ProjectReaderTests(ProjectMemberTests, base.BaseVolumeTest):
credentials = ['project_reader', 'project_admin', 'system_admin']
+
+ @decorators.idempotent_id('d16034fc-4204-4ea8-94b3-714de59fdfbf')
+ def test_get_capabilities(self):
+ super().test_get_capabilities()
diff --git a/tox.ini b/tox.ini
index d217818..8844306 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,9 @@
[tox]
-minversion = 3.18.0
+minversion = 4.0.0
+# specify virtualenv here to keep local runs consistent with the
+# gate (it sets the versions of pip, setuptools, and wheel)
+requires = virtualenv>=20.17.1
envlist = pep8
-skipsdist = True
# this allows tox to infer the base python from the environment name
# and override any basepython configured in this file
ignore_basepython_conflict=true