benchmark-runner 1.0.822__tar.gz → 1.0.824__tar.gz

{benchmark_runner-1.0.822/benchmark_runner.egg-info → benchmark_runner-1.0.824}/PKG-INFO

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

{benchmark_runner-1.0.822 → benchmark_runner-1.0.824}/benchmark_runner/common/grafana/update_grafana_latest_value_mappings.py

@@ -26,6 +26,30 @@ class UpdateGrafanaLatestValueMappings:
         self.main_libsonnet_path = main_libsonnet_path
         self.value_mappings = self.get_value_mappings()
 
+    @staticmethod
+    def _normalize_version_for_grafana(version: str) -> str:
+        """
+        Normalizes a version string for Grafana, then strips all non-digit characters.
+
+        Examples:
+            '4.14.0-ec.2' -> '414002'
+            '4.15.0-rc.3' -> '415013'
+            '4.15.5' -> '4155'
+
+        Returns:
+            A normalized numeric string, replacing '-ec.' with '0' and '-rc.' with '1' if present;
+            otherwise returns the version string with all non-digit characters removed.
+        """
+        qualifiers = {'-ec.': '0', '-rc.': '1'}
+        for qualifier, replacement in qualifiers.items():
+            if qualifier in version:
+                replaced = version.replace(qualifier, replacement)
+                digits_only = ''.join(c for c in replaced if c.isdigit())
+                return digits_only
+
+        # No qualifier found; return only digits from the original version
+        return ''.join(c for c in version if c.isdigit())
+
     def get_last_elasticsearch_versions(self, last_es_fetch_days=LAST_ES_FETCH_DAYS):
         """
         This method fetches new versions from ElasticSearch
@@ -42,10 +66,11 @@ class UpdateGrafanaLatestValueMappings:
         display_versions = ['ocp_version', 'cnv_version', 'kata_version', 'kata_rpm_version', 'odf_version']
         for id in ids:
             data = self.elasticsearch.get_elasticsearch_index_by_id(index='ci-status', id=id)
-            for version, value in data['_source'].items():
-                if version in display_versions and value not in new_versions.values() and len(value) < self.MAX_VERSION_LEN:
-                    # Display only numbers in the Grafana panel, removing characters
-                    new_versions[value.translate(str.maketrans('', '', '.-rcef'))] = value
+            for resource, version in data['_source'].items():
+                if resource in display_versions and version not in new_versions.values() and len(version) < self.MAX_VERSION_LEN:
+                    # Normalize version for Grafana panel if it contains non-digit characters
+                    normalized = self._normalize_version_for_grafana(version)
+                    new_versions[normalized] = version
 
         return new_versions
 
@@ -88,9 +113,11 @@ class UpdateGrafanaLatestValueMappings:
         max_index, max_key = sorted_mapping[-1][1]['index'], sorted_mapping[-1][0]
 
         num = 1
-        for key, value in last_versions.items():
-            if not self.value_mappings.get(key):
-                self.value_mappings[key] = {"index": int(max_index) + num, "text": value}
+        for version_key, version in last_versions.items():
+            if not self.value_mappings.get(version_key) or self.value_mappings[version_key]['text'] != version:
+                # Normalize version for Grafana panel
+                normalized = self._normalize_version_for_grafana(version)
+                self.value_mappings[normalized] = {"index": int(max_index) + num, "text": version}
                 num += 1
 
     def update_main_libsonnet(self):

{benchmark_runner-1.0.822 → benchmark_runner-1.0.824}/benchmark_runner/common/oc/oc.py

@@ -1582,21 +1582,24 @@ class OC(SSH):
                     raise RuntimeError(f"Failed to remove folder {folder_path}: {remove_error}")
             raise RuntimeError(f"Failed to generate CNV must-gather logs for version {cnv_version}: {e}")
 
-    def save_to_yaml(self, vm_name, output_dir='/tmp', namespace: str = environment_variables.environment_variables_dict['namespace']):
+    def save_to_yaml(self, vm_name, vm_access, output_dir='/tmp', namespace: str = environment_variables.environment_variables_dict['namespace']):
         """
         This method save pod and vm into yaml per namespace
         :param vm_name:
+        :param vm_access: True is vm accessible, if not there is no pod launcher
         :param namespace:
         :param output_dir:
         :return:
         """
-        self.run(f"oc get vmi '{vm_name}' -n '{namespace}' -o yaml > '{output_dir}/{vm_name}.yaml'")
-        pod_name = self.run(
-            f"oc get pod -n '{namespace}' -o jsonpath=\"{{.items[?(@.metadata.generateName=='virt-launcher-{vm_name}-')].metadata.name}}\""
-        )
-        self.run(f"oc get pod '{pod_name}' -n '{namespace}' -o yaml > '{output_dir}/{pod_name}.yaml'")
+        self.run(f"oc get vm '{vm_name}' -n '{namespace}' -o yaml > '{output_dir}/vm-{vm_name}.yaml'")
+        if vm_access:
+            self.run(f"oc get vmi '{vm_name}' -n '{namespace}' -o yaml > '{output_dir}/vmi-{vm_name}.yaml'")
+            pod_name = self.run(
+                f"oc get pod -n '{namespace}' -o jsonpath=\"{{.items[?(@.metadata.generateName=='virt-launcher-{vm_name}-')].metadata.name}}\""
+            )
+            self.run(f"oc get pod '{pod_name}' -n '{namespace}' -o yaml > '{output_dir}/{pod_name}.yaml'")
 
-    def save_describe_yml(self, vm_name, vm_access, output_dir='/tmp', namespace: str = environment_variables.environment_variables_dict['namespace']):
+    def save_describe_yaml(self, vm_name, vm_access, output_dir='/tmp', namespace: str = environment_variables.environment_variables_dict['namespace']):
         """
         This method save pod and vm into yaml per namespace
         :param vm_name:
@@ -1605,11 +1608,10 @@ class OC(SSH):
         :param output_dir:
         :return:
         """
+        self.run(f"oc describe vm '{vm_name}' -n '{namespace}' > '{output_dir}/describe-vm-{vm_name}.yaml'")
         if vm_access:
-            self.run(f"oc describe vmi '{vm_name}' -n '{namespace}' > '{output_dir}/describe_vmi_{vm_name}.yaml'")
+            self.run(f"oc describe vmi '{vm_name}' -n '{namespace}' > '{output_dir}/describe-vmi-{vm_name}.yaml'")
             pod_name = self.run(
                 f'oc get pod -n {namespace} -o jsonpath="{{.items[?(@.metadata.generateName==\'virt-launcher-{vm_name}-\')].metadata.name}}"'
             )
-            self.run(f"oc describe pod '{pod_name}' -n '{namespace}' > '{output_dir}/describe_pod_{pod_name}.yaml'")
-        else:
-            self.run(f"oc describe vm '{vm_name}' -n '{namespace}' > '{output_dir}/describe_vm_{vm_name}.yaml'")
+            self.run(f"oc describe pod '{pod_name}' -n '{namespace}' > '{output_dir}/describe-pod-{pod_name}.yaml'")

{benchmark_runner-1.0.822 → benchmark_runner-1.0.824}/benchmark_runner/workloads/bootstorm_vm.py

@@ -166,7 +166,7 @@ class BootstormVM(WorkloadsOperations):
 
     def _verify_single_vm_access(self, vm_name, retries=5, delay=10):
         """
-        This method verifies single vm access using a retry mechanism
+        This method verifies access to a single VM using a retry mechanism, and saves the error and YAML file in case of failure
         :param vm_name: The name of the VM to verify.
         :param retries: Number of retry attempts.
         :param delay: Time to wait (in seconds) between retries.
@@ -214,8 +214,11 @@ class BootstormVM(WorkloadsOperations):
             status_message = self._data_dict.get('access_status') or "No status available"
 
             try:
+                self._oc.save_to_yaml(vm_name, str(access_status).lower() == 'true', output_dir=self._run_artifacts_path)
+                self._oc.save_describe_yaml(vm_name, str(access_status).lower() == 'true', output_dir=self._run_artifacts_path)
                 with open(error_log_path, "w") as error_log_file:
                     error_log_file.write(self._oc.get_vm_status(vm_name=vm_name) + "\n")
+                    error_log_file.write("VM Status: " + access_status + "\n")
                     error_log_file.write("Running node: " + self._oc.get_vm_node(vm_name=vm_name) + "\n\n")
                     error_log_file.write(str(status_message) + "\n")
             except Exception as write_err:
@@ -231,9 +234,7 @@ class BootstormVM(WorkloadsOperations):
         :param return_dict:
         :return:
         """
-        self._oc.save_to_yaml(vm_name, output_dir=self._run_artifacts_path)
         vm_access = self._verify_single_vm_access(vm_name)
-        self._oc.save_describe_yml(vm_name, str(vm_access).lower() == 'true', output_dir=self._run_artifacts_path)
         return_dict[vm_name] = vm_access
 
     def _verify_vms_access_in_parallel(self, vm_names: list):

{benchmark_runner-1.0.822 → benchmark_runner-1.0.824/benchmark_runner.egg-info}/PKG-INFO

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

{benchmark_runner-1.0.822 → benchmark_runner-1.0.824}/setup.py

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