benchmark-runner 1.0.720__tar.gz → 1.0.722__tar.gz

{benchmark_runner-1.0.720/benchmark_runner.egg-info → benchmark_runner-1.0.722}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: benchmark-runner
-Version: 1.0.720
+Version: 1.0.722
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat

{benchmark_runner-1.0.720 → benchmark_runner-1.0.722}/benchmark_runner/benchmark_operator/benchmark_operator_workloads_operations.py

@@ -76,6 +76,7 @@ class BenchmarkOperatorWorkloadsOperations:
         self._prometheus_metrics_operation = PrometheusMetricsOperation()
         # Extract lso id for LSO workload
         if '_lso' in self._environment_variables_dict.get('workload'):
+            self._oc.delete_available_released_pv()
             # Update lso_disk_id only if both worker_disk_ids and a free disk exist
             if self._environment_variables_dict.get('worker_disk_ids', '') and self._oc.get_free_disk_id(
                     node=self._environment_variables_dict['lso_node']):

{benchmark_runner-1.0.720 → benchmark_runner-1.0.722}/benchmark_runner/common/oc/oc.py

@@ -165,10 +165,15 @@ class OC(SSH):
 
     def get_odf_version(self):
         """
-        This method returns odf version
-        :return:
+        This method returns the ODF version by extracting it from the csv name.
+        :return: ODF version as a string (e.g., '4.17.2')
         """
-        return self.run(f"{self.__cli} get csv -n openshift-storage -o jsonpath='{{.items[0].spec.labels.full_version}}'")
+        # OCP 4.16 and below
+        if self.get_ocp_major_version() <= 4 and self.get_ocp_minor_version() <= 16:
+            command = f"{self.__cli} get csv -n openshift-storage -o jsonpath='{{.items[0].spec.labels.full_version}}'"
+        else:
+            command = f"{self.__cli} get csv -n openshift-storage -o jsonpath='{{range .items[*]}}{{.metadata.name}}{{\"\\n\"}}{{end}}' | grep odf-operator | sed -E 's/odf-operator.v([0-9]+\\.[0-9]+\\.[0-9]+)-rhodf/\\1/'"
+        return self.run(command)
 
     def remove_lso_path(self):
         """
@@ -533,8 +538,8 @@ class OC(SSH):
             if pv_status == 'Available' or pv_status == 'Released':
                 available_pv = self.run(fr"{self.__cli} get pv -o jsonpath={{.items[{ind}].metadata.name}}")
                 logger.info(f'Delete {pv_status} pv {available_pv}')
-                self.run(fr"{self.__cli} delete localvolume -n openshift-local-storage local-disks")
-                self.run(fr"{self.__cli} delete pv {available_pv}")
+                self.run(fr"{self.__cli} delete localvolume -n openshift-local-storage local-disks --wait=false")
+                self.run(fr"{self.__cli} delete pv {available_pv} --wait=false")
 
     def clear_node_caches(self):
         """
@@ -612,7 +617,7 @@ class OC(SSH):
         :return:
         """
         if os.path.isfile(yaml):
-            return self.run(f'{self.__cli} delete -f {yaml}')
+            return self.run(f'{self.__cli} delete -f {yaml} --wait=false')
         else:
             raise YAMLNotExist(yaml)
 

{benchmark_runner-1.0.720 → benchmark_runner-1.0.722/benchmark_runner.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: benchmark-runner
-Version: 1.0.720
+Version: 1.0.722
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat

{benchmark_runner-1.0.720 → benchmark_runner-1.0.722}/setup.py

@@ -4,7 +4,7 @@ from os import path
 from setuptools import setup, find_packages
 
 
-__version__ = '1.0.720'  # update also .bumpversion.cfg
+__version__ = '1.0.722'  # update also .bumpversion.cfg
 
 
 here = path.abspath(path.dirname(__file__))