Merge "Add run tests as thin provisioning"
diff --git a/manila_tempest_tests/tests/api/admin/test_replication_actions.py b/manila_tempest_tests/tests/api/admin/test_replication_actions.py
index ba8d63b..6d71476 100644
--- a/manila_tempest_tests/tests/api/admin/test_replication_actions.py
+++ b/manila_tempest_tests/tests/api/admin/test_replication_actions.py
@@ -114,7 +114,7 @@
def test_manage_share_for_replication_type(self):
"""Manage a share with replication share type."""
# Create a share and unmanage it
- share = self.create_share(size=2,
+ share = self.create_share(size=CONF.share.share_size,
share_type_id=self.share_type_id,
availability_zone=self.share_zone,
share_network_id=self.sn_id,
@@ -164,7 +164,7 @@
'Manage/Unmanage Tests are disabled.')
def test_unmanage_replicated_share_with_no_replica(self):
"""Unmanage a replication type share that does not have replica."""
- share = self.create_share(size=2,
+ share = self.create_share(size=CONF.share.share_size,
share_type_id=self.share_type_id,
share_network_id=self.sn_id,
availability_zone=self.share_zone,
diff --git a/manila_tempest_tests/tests/api/admin/test_share_servers_migration.py b/manila_tempest_tests/tests/api/admin/test_share_servers_migration.py
index 81b447f..98150b8 100644
--- a/manila_tempest_tests/tests/api/admin/test_share_servers_migration.py
+++ b/manila_tempest_tests/tests/api/admin/test_share_servers_migration.py
@@ -383,17 +383,6 @@
resource_name='share_server'
)
- # Check if the source server went to inactive status if it exists.
- try:
- src_server = self.shares_v2_client.show_share_server(
- src_server_id)['share_server']
- except exceptions.NotFound:
- src_server = None
-
- if src_server:
- self.assertEqual(
- src_server['status'], constants.SERVER_STATE_INACTIVE)
-
# Validate the share server migration complete.
share = self.shares_v2_client.get_share(share['id'])['share']
self._validate_share_server_migration_complete(
diff --git a/manila_tempest_tests/tests/api/test_share_group_actions.py b/manila_tempest_tests/tests/api/test_share_group_actions.py
index 680b565..a07e99f 100644
--- a/manila_tempest_tests/tests/api/test_share_group_actions.py
+++ b/manila_tempest_tests/tests/api/test_share_group_actions.py
@@ -80,8 +80,8 @@
# Create 2 shares - inside first and second share groups
cls.share_name = data_utils.rand_name("tempest-share-name")
cls.share_desc = data_utils.rand_name("tempest-share-description")
- cls.share_size = 1
- cls.share_size2 = 2
+ cls.share_size = CONF.share.share_size
+ cls.share_size2 = CONF.share.share_size + 2
cls.shares = cls.create_shares([
{'kwargs': {
'name': cls.share_name,
diff --git a/manila_tempest_tests/tests/api/test_share_groups_negative.py b/manila_tempest_tests/tests/api/test_share_groups_negative.py
index 68fb18f..c45cc95 100644
--- a/manila_tempest_tests/tests/api/test_share_groups_negative.py
+++ b/manila_tempest_tests/tests/api/test_share_groups_negative.py
@@ -65,7 +65,7 @@
# Create a share in the share group
cls.share_name = data_utils.rand_name("tempest-share-name")
cls.share_desc = data_utils.rand_name("tempest-share-description")
- cls.share_size = 1
+ cls.share_size = CONF.share.share_size
cls.share = cls.create_share(
name=cls.share_name,
description=cls.share_desc,
diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml
index 164db72..f31ff11 100644
--- a/zuul.d/manila-tempest-jobs.yaml
+++ b/zuul.d/manila-tempest-jobs.yaml
@@ -58,7 +58,9 @@
timeout: 10800
irrelevant-files: *irrelevant-files
required-projects: *manila-tempest-required-projects
- vars: *manila-tempest-base-vars
+ vars:
+ <<: *manila-tempest-base-vars
+ tempest_exclude_regex: "(^manila_tempest_tests.tests.scenario.*IPv6.*)"
- job:
name: manila-tempest-plugin-standalone-base
diff --git a/zuul.d/manila-tempest-stable-jobs.yaml b/zuul.d/manila-tempest-stable-jobs.yaml
index 42d08d6..ff74f5d 100644
--- a/zuul.d/manila-tempest-stable-jobs.yaml
+++ b/zuul.d/manila-tempest-stable-jobs.yaml
@@ -5,15 +5,21 @@
parent: manila-tempest-plugin-lvm
override-checkout: stable/wallaby
nodeset: openstack-single-node-focal
+ vars:
+ tempest_exclude_regex: ''
- job:
name: manila-tempest-plugin-lvm-victoria
parent: manila-tempest-plugin-lvm
override-checkout: stable/victoria
nodeset: openstack-single-node-focal
+ vars:
+ tempest_exclude_regex: ''
- job:
name: manila-tempest-plugin-lvm-ussuri
parent: manila-tempest-plugin-lvm
override-checkout: stable/ussuri
nodeset: openstack-single-node-bionic
+ vars:
+ tempest_exclude_regex: ''