Merge "Correct share group tests cleanup order"
diff --git a/manila_tempest_tests/services/share/v2/json/shares_client.py b/manila_tempest_tests/services/share/v2/json/shares_client.py
index 648b282..6d5e8fb 100644
--- a/manila_tempest_tests/services/share/v2/json/shares_client.py
+++ b/manila_tempest_tests/services/share/v2/json/shares_client.py
@@ -1159,8 +1159,8 @@
headers, _junk = utils.get_extra_headers(
version, constants.SHARE_GROUPS_GRADUATION_VERSION)
return self.reset_state(
- share_group_id, status=status, s_type='groups', headers=headers,
- version=version)
+ share_group_id, status=status, s_type='share-groups',
+ headers=headers, version=version)
def share_group_force_delete(self, share_group_id,
version=LATEST_MICROVERSION):
diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml
index de1298f..8a09e9f 100644
--- a/zuul.d/manila-tempest-jobs.yaml
+++ b/zuul.d/manila-tempest-jobs.yaml
@@ -408,6 +408,11 @@
- openstack/neutron-dynamic-routing
vars:
tempest_concurrency: 2
+ # turning off some tests due to exhaustion of disk space
+ # https://bugs.launchpad.net/manila/+bug/2009083
+ tempest_exclude_regex: "\
+ (^manila_tempest_tests.tests.scenario.test_share_extend.TestShareExtendNFSIPv6.test_create_extend_and_write)|\
+ (^manila_tempest_tests.tests.scenario.test_share_shrink.TestShareShrinkNFSIPv6.test_create_shrink_and_write)"
devstack_services: *devstack-with-ovs # LP 1940324
devstack_plugins:
devstack-plugin-ceph: https://opendev.org/openstack/devstack-plugin-ceph