diff options
Diffstat (limited to 'tests/functional/provisioning')
4 files changed, 27 insertions, 2 deletions
diff --git a/tests/functional/provisioning/test_dynamic_provisioning_block.py b/tests/functional/provisioning/test_dynamic_provisioning_block.py index 8b668d62..88d9c9f8 100644 --- a/tests/functional/provisioning/test_dynamic_provisioning_block.py +++ b/tests/functional/provisioning/test_dynamic_provisioning_block.py @@ -32,6 +32,7 @@ from openshiftstoragelibs.openshift_ops import ( wait_for_pod_be_ready, wait_for_resource_absence, ) +from openshiftstoragelibs.openshift_version import get_openshift_version from openshiftstoragelibs.waiter import Waiter @@ -316,6 +317,10 @@ class TestDynamicProvisioningBlockP0(GlusterBlockBaseClass): def test_dynamic_provisioning_glusterblock_reclaim_policy_retain(self): """Validate retain policy for gluster-block after PVC deletion""" + if get_openshift_version() < "3.9": + self.skipTest( + "'Reclaim' feature is not supported in OCP older than 3.9") + self.create_storage_class(reclaim_policy='Retain') self.create_and_wait_for_pvc() diff --git a/tests/functional/provisioning/test_dynamic_provisioning_file.py b/tests/functional/provisioning/test_dynamic_provisioning_file.py index e63a3035..4f361834 100644 --- a/tests/functional/provisioning/test_dynamic_provisioning_file.py +++ b/tests/functional/provisioning/test_dynamic_provisioning_file.py @@ -28,6 +28,7 @@ from openshiftstoragelibs.openshift_ops import ( verify_pvc_status_is_bound, wait_for_pod_be_ready, wait_for_resource_absence) +from openshiftstoragelibs.openshift_version import get_openshift_version from openshiftstoragelibs.waiter import Waiter @@ -110,6 +111,11 @@ class TestDynamicProvisioningP0(BaseClass): def test_dynamic_provisioning_glusterfile_volname_prefix(self): """Validate dynamic provisioning for gluster file with vol name prefix """ + if get_openshift_version() < "3.9": + self.skipTest( + "'volumenameprefix' option for Heketi is not supported" + " in OCP older than 3.9") + g.log.info("test_dynamic_provisioning_glusterfile volname prefix") self.dynamic_provisioning_glusterfile(True) @@ -398,6 +404,10 @@ class TestDynamicProvisioningP0(BaseClass): def test_dynamic_provisioning_glusterfile_reclaim_policy_retain(self): """Validate retain policy for glusterfs after deletion of pvc""" + if get_openshift_version() < "3.9": + self.skipTest( + "'Reclaim' feature is not supported in OCP older than 3.9") + self.create_storage_class(reclaim_policy='Retain') self.create_and_wait_for_pvc() @@ -442,6 +452,11 @@ class TestDynamicProvisioningP0(BaseClass): def test_usage_of_default_storage_class(self): """Validate PVs creation for SC with default custom volname prefix""" + if get_openshift_version() < "3.9": + self.skipTest( + "'volumenameprefix' option for Heketi is not supported" + " in OCP older than 3.9") + # Unset 'default' option from all the existing Storage Classes unset_sc_annotation_cmd = ( r"""oc annotate sc %s """ diff --git a/tests/functional/provisioning/test_pv_resize.py b/tests/functional/provisioning/test_pv_resize.py index ec6cc24c..a5b9d2c2 100644 --- a/tests/functional/provisioning/test_pv_resize.py +++ b/tests/functional/provisioning/test_pv_resize.py @@ -40,8 +40,7 @@ class TestPvResizeClass(BaseClass): def setUp(self): super(TestPvResizeClass, self).setUp() if getattr(self, "skip_me", False): - msg = ("pv resize is not available in openshift " - "version %s " % self.version) + msg = ("pv resize is not available in openshift older than v3.9") g.log.error(msg) raise self.skipTest(msg) diff --git a/tests/functional/provisioning/test_storage_class_cases.py b/tests/functional/provisioning/test_storage_class_cases.py index 27982d5d..8a04c8ea 100644 --- a/tests/functional/provisioning/test_storage_class_cases.py +++ b/tests/functional/provisioning/test_storage_class_cases.py @@ -20,6 +20,7 @@ from openshiftstoragelibs.openshift_ops import ( wait_for_pod_be_ready, wait_for_resource_absence, ) +from openshiftstoragelibs.openshift_version import get_openshift_version @ddt.ddt @@ -247,6 +248,11 @@ class TestStorageClassCases(BaseClass): def test_create_and_verify_pvc_with_volume_name_prefix(self): """create and verify pvc with volname prefix on an app pod""" + if get_openshift_version() < "3.9": + self.skipTest( + "'volumenameprefix' option for Heketi is not supported" + " in OCP older than 3.9") + sc_name = self.create_storage_class(create_vol_name_prefix=True) pvc_name = self.create_and_wait_for_pvc(sc_name=sc_name) namespace = (self.sc.get( |