benchmark-runner 1.0.713__tar.gz → 1.0.729__tar.gz

{benchmark_runner-1.0.713/benchmark_runner.egg-info → benchmark_runner-1.0.729}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: benchmark-runner
-Version: 1.0.713
+Version: 1.0.729
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat
@@ -27,7 +27,7 @@ Requires-Dist: google-auth-httplib2==0.2.0
 Requires-Dist: google-auth-oauthlib==1.2.0
 Requires-Dist: google-api-python-client==2.135.0
 Requires-Dist: ipywidgets==8.0.6
-Requires-Dist: jinja2==3.1.4
+Requires-Dist: jinja2==3.1.5
 Requires-Dist: myst-parser==1.0.0
 Requires-Dist: openshift-client==1.0.17
 Requires-Dist: prometheus-api-client==0.5.1
@@ -42,6 +42,15 @@ Requires-Dist: tenacity==8.0.1
 Requires-Dist: tqdm==4.66.3
 Requires-Dist: typeguard==2.12.1
 Requires-Dist: typing==3.7.4.3
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 <div align="center">
   <img src="https://github.com/redhat-performance/benchmark-runner/blob/main/media/benchmark_runner.png"><br>

{benchmark_runner-1.0.713 → benchmark_runner-1.0.729}/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.713 → benchmark_runner-1.0.729}/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):
         """
@@ -203,15 +208,19 @@ class OC(SSH):
 
     def get_free_disk_id(self, node: str = None):
         """
-        This method returns free disk per node  [workers disk ids - workers pv disk ids]
+        This method returns a free disk ID for a given node (or all nodes if no node is specified).
+        It identifies the disk by comparing workers' disk IDs with PV disk IDs.
         """
         workers_disk_ids = self.get_worker_disk_ids(node)
         workers_pv_disk_ids = self.get_pv_disk_ids()
-        free_disk_id = f'{self.__worker_disk_prefix}{[disk_id for disk_id in workers_disk_ids if disk_id not in workers_pv_disk_ids][0]}'
-        if free_disk_id:
-            return free_disk_id
+
+        # Find free disk IDs
+        free_disks = [disk_id for disk_id in workers_disk_ids if disk_id not in workers_pv_disk_ids]
+
+        if free_disks:
+            return f'{self.__worker_disk_prefix}{free_disks[0]}'
         else:
-            raise ValueError('Missing free disk id')
+            raise ValueError('No free disk IDs available. All worker disks are already in use.')
 
     @typechecked
     def run_debug_node(self, node: str, cmd: str):
@@ -529,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):
         """
@@ -608,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.729/benchmark_runner/common/ocp_resources/lso/template/03_catalogsource_template.yaml

@@ -0,0 +1,13 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: CatalogSource
+metadata:
+  name: redhat-operators-v{{ lso_version | replace('.', '') }}
+  namespace: openshift-marketplace
+spec:
+  displayName: Red Hat Operators v{{ lso_version | replace('.', '') }}
+  image: registry.redhat.io/redhat/redhat-operator-index:v{{ lso_version }}
+  publisher: Red Hat
+  sourceType: grpc
+  updateStrategy:
+    registryPoll:
+      interval: 30m0s

benchmark_runner-1.0.713/benchmark_runner/common/ocp_resources/lso/template/03_subscription_template.yaml → benchmark_runner-1.0.729/benchmark_runner/common/ocp_resources/lso/template/04_subscription_template.yaml

@@ -7,5 +7,6 @@ spec:
   channel: "stable"
   installPlanApproval: Automatic
   name: local-storage-operator
-  source: redhat-operators
+  source: redhat-operators-v{{ lso_version | replace('.', '') }}   # <-- Modify the name of the redhat-operators catalogsource if not default
   sourceNamespace: openshift-marketplace
+

{benchmark_runner-1.0.713 → benchmark_runner-1.0.729}/benchmark_runner/common/template_operations/templates/stressng/internal_data/stressng_vm_template.yaml

@@ -40,7 +40,7 @@ spec:
         sockets: {{ sockets }}
         cores: 1
         threads: 1
-        image: quay.io/kubevirt/fedora-container-disk-images:34
+        image: quay.io/ebattat/fedora37-container-disk:latest
         limits:
           memory: {{ limits_memory }}
         requests:

{benchmark_runner-1.0.713 → benchmark_runner-1.0.729/benchmark_runner.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: benchmark-runner
-Version: 1.0.713
+Version: 1.0.729
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat
@@ -27,7 +27,7 @@ Requires-Dist: google-auth-httplib2==0.2.0
 Requires-Dist: google-auth-oauthlib==1.2.0
 Requires-Dist: google-api-python-client==2.135.0
 Requires-Dist: ipywidgets==8.0.6
-Requires-Dist: jinja2==3.1.4
+Requires-Dist: jinja2==3.1.5
 Requires-Dist: myst-parser==1.0.0
 Requires-Dist: openshift-client==1.0.17
 Requires-Dist: prometheus-api-client==0.5.1
@@ -42,6 +42,15 @@ Requires-Dist: tenacity==8.0.1
 Requires-Dist: tqdm==4.66.3
 Requires-Dist: typeguard==2.12.1
 Requires-Dist: typing==3.7.4.3
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 <div align="center">
   <img src="https://github.com/redhat-performance/benchmark-runner/blob/main/media/benchmark_runner.png"><br>

{benchmark_runner-1.0.713 → benchmark_runner-1.0.729}/benchmark_runner.egg-info/SOURCES.txt

@@ -80,7 +80,8 @@ benchmark_runner/common/ocp_resources/kata/template/02_config_template.yaml
 benchmark_runner/common/ocp_resources/kata/template/03_ocp48_patch_template.sh
 benchmark_runner/common/ocp_resources/lso/template/01_namespace_template.yaml
 benchmark_runner/common/ocp_resources/lso/template/02_operator_group_template.yaml
-benchmark_runner/common/ocp_resources/lso/template/03_subscription_template.yaml
+benchmark_runner/common/ocp_resources/lso/template/03_catalogsource_template.yaml
+benchmark_runner/common/ocp_resources/lso/template/04_subscription_template.yaml
 benchmark_runner/common/ocp_resources/nhc_snr/template/01_namespace_template.yaml
 benchmark_runner/common/ocp_resources/nhc_snr/template/02_operator_group_template.yaml
 benchmark_runner/common/ocp_resources/nhc_snr/template/03_subscription_template.yaml

{benchmark_runner-1.0.713 → benchmark_runner-1.0.729}/benchmark_runner.egg-info/requires.txt

@@ -10,7 +10,7 @@ google-auth-httplib2==0.2.0
 google-auth-oauthlib==1.2.0
 google-api-python-client==2.135.0
 ipywidgets==8.0.6
-jinja2==3.1.4
+jinja2==3.1.5
 myst-parser==1.0.0
 openshift-client==1.0.17
 prometheus-api-client==0.5.1

{benchmark_runner-1.0.713 → benchmark_runner-1.0.729}/setup.py

@@ -4,7 +4,7 @@ from os import path
 from setuptools import setup, find_packages
 
 
-__version__ = '1.0.713'  # update also .bumpversion.cfg
+__version__ = '1.0.729'  # update also .bumpversion.cfg
 
 
 here = path.abspath(path.dirname(__file__))
@@ -54,7 +54,7 @@ setup(
         'google-auth-oauthlib==1.2.0',  # for Google Drive
         'google-api-python-client==2.135.0',  # for Google Drive
         'ipywidgets==8.0.6',  # for jupyterlab widgets
-        'jinja2==3.1.4',  # for yaml templates and df.style
+        'jinja2==3.1.5',  # for yaml templates and df.style
         'myst-parser==1.0.0',  # readthedocs
         'openshift-client==1.0.17',  # clusterbuster && prometheus metrics
         'prometheus-api-client==0.5.1',  # clusterbuster && prometheus metrics