Merge "Deleting volumes which are consumed as a basis for others"
diff --git a/.zuul.yaml b/.zuul.yaml
index be6d789..2b6b59c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -25,9 +25,9 @@
# branches. That is what we need to do for all tempest plugins. Only jobs
# for the current releasable ("Maintained") stable branches should be listed
# here.
+ - cinder-tempest-plugin-basic-2023-2
- cinder-tempest-plugin-basic-2023-1
- cinder-tempest-plugin-basic-zed
- - cinder-tempest-plugin-basic-yoga
- cinder-tempest-plugin-protection-functional
gate:
jobs:
@@ -38,9 +38,9 @@
- cinder-tempest-plugin-cbak-ceph
experimental:
jobs:
+ - cinder-tempest-plugin-cbak-ceph-2023-2
- cinder-tempest-plugin-cbak-ceph-2023-1
- cinder-tempest-plugin-cbak-ceph-zed
- - cinder-tempest-plugin-cbak-ceph-yoga
- job:
name: cinder-tempest-plugin-protection-functional
@@ -51,10 +51,13 @@
vars:
tox_envlist: all
tempest_test_regex: 'cinder_tempest_plugin.rbac'
+ devstack_localrc:
+ KEYSTONE_ENFORCE_SCOPE: True
devstack_local_conf:
test-config:
$CINDER_CONF:
oslo_policy:
+ enforce_scope: True
enforce_new_defaults: True
$TEMPEST_CONFIG:
enforce_scope:
@@ -266,6 +269,12 @@
timeout: 10800
- job:
+ name: cinder-tempest-plugin-cbak-ceph-2023-2
+ parent: cinder-tempest-plugin-cbak-ceph
+ nodeset: openstack-single-node-jammy
+ override-checkout: stable/2023.2
+
+- job:
name: cinder-tempest-plugin-cbak-ceph-2023-1
parent: cinder-tempest-plugin-cbak-ceph
nodeset: openstack-single-node-jammy
@@ -277,12 +286,6 @@
nodeset: openstack-single-node-focal
override-checkout: stable/zed
-- job:
- name: cinder-tempest-plugin-cbak-ceph-yoga
- parent: cinder-tempest-plugin-cbak-ceph
- nodeset: openstack-single-node-focal
- override-checkout: stable/yoga
-
# variant for pre-Ussuri branches (no volume revert for Ceph),
# should this job be used on those branches
- job:
@@ -413,6 +416,12 @@
- ^releasenotes/.*$
- job:
+ name: cinder-tempest-plugin-basic-2023-2
+ parent: cinder-tempest-plugin-basic
+ nodeset: openstack-single-node-jammy
+ override-checkout: stable/2023.2
+
+- job:
name: cinder-tempest-plugin-basic-2023-1
parent: cinder-tempest-plugin-basic
nodeset: openstack-single-node-jammy
@@ -423,9 +432,3 @@
parent: cinder-tempest-plugin-basic
nodeset: openstack-single-node-focal
override-checkout: stable/zed
-
-- job:
- name: cinder-tempest-plugin-basic-yoga
- parent: cinder-tempest-plugin-basic
- nodeset: openstack-single-node-focal
- override-checkout: stable/yoga
diff --git a/cinder_tempest_plugin/api/volume/base.py b/cinder_tempest_plugin/api/volume/base.py
index ea6bd2e..76d0383 100644
--- a/cinder_tempest_plugin/api/volume/base.py
+++ b/cinder_tempest_plugin/api/volume/base.py
@@ -16,7 +16,6 @@
from tempest.common import compute
from tempest.common import waiters
from tempest import config
-from tempest.lib.common import api_microversion_fixture
from tempest.lib.common import api_version_utils
from tempest.lib.common.utils import data_utils
from tempest.lib.common.utils import test_utils
@@ -57,8 +56,6 @@
def setUp(self):
super(BaseVolumeTest, self).setUp()
- self.useFixture(api_microversion_fixture.APIMicroversionFixture(
- volume_microversion=self.request_microversion))
@classmethod
def resource_setup(cls):
@@ -67,6 +64,8 @@
api_version_utils.select_request_microversion(
cls.min_microversion,
CONF.volume.min_microversion))
+ cls.setup_api_microversion_fixture(
+ volume_microversion=cls.request_microversion)
@classmethod
def create_volume(cls, wait_until='available', **kwargs):
diff --git a/cinder_tempest_plugin/rbac/v3/base.py b/cinder_tempest_plugin/rbac/v3/base.py
index af724a3..6fc6be5 100644
--- a/cinder_tempest_plugin/rbac/v3/base.py
+++ b/cinder_tempest_plugin/rbac/v3/base.py
@@ -13,7 +13,6 @@
from tempest.common import waiters
from tempest import config
-from tempest.lib.common import api_microversion_fixture
from tempest.lib.common import api_version_utils
from tempest.lib.common.utils import data_utils
from tempest.lib.common.utils import test_utils
@@ -51,8 +50,6 @@
def setUp(self):
super(VolumeV3RbacBaseTests, self).setUp()
- self.useFixture(api_microversion_fixture.APIMicroversionFixture(
- volume_microversion=self.request_microversion))
@classmethod
def resource_setup(cls):
@@ -61,6 +58,8 @@
api_version_utils.select_request_microversion(
cls.min_microversion,
CONF.volume.min_microversion))
+ cls.setup_api_microversion_fixture(
+ volume_microversion=cls.request_microversion)
def do_request(self, method, expected_status=200, client=None, **payload):
"""Perform API call