Merge branch 'red-hat-storage:master' into custom_sc_tc_changes

ocs_ci/ocs/cluster.py

@@ -2027,14 +2027,10 @@ def get_mds_cache_memory_limit():
 
     """
     pod_obj = pod.get_ceph_tools_pod()
-    try:
-        ceph_cmd = "ceph config show mds.ocs-storagecluster-cephfilesystem-a mds_cache_memory_limit"
-        mds_a_cache_memory_limit = pod_obj.exec_ceph_cmd(ceph_cmd=ceph_cmd)
-        ceph_cmd = "ceph config show mds.ocs-storagecluster-cephfilesystem-b mds_cache_memory_limit"
-        mds_b_cache_memory_limit = pod_obj.exec_ceph_cmd(ceph_cmd=ceph_cmd)
-    except IOError as ioe:
-        if "ENOENT" not in ioe:
-            raise ioe
+    ceph_cmd = "ceph config show mds.ocs-storagecluster-cephfilesystem-a mds_cache_memory_limit"
+    mds_a_cache_memory_limit = pod_obj.exec_ceph_cmd(ceph_cmd=ceph_cmd)
+    ceph_cmd = "ceph config show mds.ocs-storagecluster-cephfilesystem-b mds_cache_memory_limit"
+    mds_b_cache_memory_limit = pod_obj.exec_ceph_cmd(ceph_cmd=ceph_cmd)
 
     if mds_a_cache_memory_limit != mds_b_cache_memory_limit:
         raise UnexpectedBehaviour(

setup.py

@@ -16,7 +16,7 @@
     license="MIT",
     install_requires=[
         "apache-libcloud==3.1.0",
-        "cryptography==39.0.1",
+        "cryptography==41.0.5",
         "docopt==0.6.2",
         # https://pypi.org/project/gevent/ the latest version resolves problem for Mac M1 chips
         # This issue is caused by a program attempting to load an x86_64-only library from a native arm64 process.

tests/e2e/performance/csi_tests/test_pvc_snapshot_performance.py

@@ -251,7 +251,7 @@ def test_pvc_snapshot_performance(self, pvc_size):
             self.pod_object.fillup_fs(size=file_size, fio_filename=file_name)
 
             # Wait for fio to finish
-            fio_result = self.pod_object.get_fio_results()
+            fio_result = self.pod_object.get_fio_results(timeout=3600)
             err_count = fio_result.get("jobs")[0].get("error")
             assert (
                 err_count == 0
@@ -607,7 +607,6 @@ def test_pvc_snapshot_performance_multiple_files(
         self.full_results.add_key("threads", threads)
         self.full_results.add_key("interface", interface)
         for test_num in range(self.tests_numbers):
-
             test_results = {"creation_time": None, "csi_creation_time": None}
 
             # deploy the smallfile workload

tests/e2e/workloads/ocp/monitoring/test_monitoring_on_negative_scenarios.py

@@ -36,7 +36,7 @@
     skipif_aws_i3,
     skipif_vsphere_ipi,
     skipif_ibm_cloud,
-    blue_squad,
+    magenta_squad,
 )
 
 log = logging.getLogger(__name__)
@@ -111,7 +111,7 @@ def wait_for_nodes_status_and_prometheus_health_check(pods, threading_lock):
     assert prometheus_health_check(), "Prometheus health is degraded"
 
 
-@blue_squad
+@magenta_squad
 @ignore_leftovers
 @workloads
 @skipif_vsphere_ipi

tests/manage/z_cluster/test_ceph_default_values_check.py

@@ -24,6 +24,7 @@
 from ocs_ci.ocs.cluster import get_mds_cache_memory_limit
 from ocs_ci.utility import version
 from ocs_ci.utility.retry import retry
+from ocs_ci.ocs.exceptions import CommandFailed
 
 
 log = logging.getLogger(__name__)
@@ -155,12 +156,12 @@ def test_check_mds_cache_memory_limit(self):
         Testcase to check mds cache memory limit post ocs upgrade
 
         """
-        mds_cache_memory_limit = get_mds_cache_memory_limit()
         mds_cache_memory_limit = retry(
-            (IOError),
+            (IOError, CommandFailed),
             tries=6,
             delay=20,
             backoff=1,
+            text_in_exception="ENOENT",
         )(get_mds_cache_memory_limit)()
         expected_mds_value = 4294967296
         expected_mds_value_in_GB = int(expected_mds_value / 1073741274)