benchmark-runner 1.0.874__tar.gz → 1.0.915__tar.gz

{benchmark_runner-1.0.874/benchmark_runner.egg-info → benchmark_runner-1.0.915}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: benchmark-runner
-Version: 1.0.874
+Version: 1.0.915
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: attrs==21.4.0
@@ -78,7 +79,7 @@ This framework support the following embedded workloads:
 * [hammerdb](https://hammerdb.com/): running hammerdb workload on the following databases: MSSQL, Mariadb, Postgresql in Pod, Kata or VM with [Configuration](benchmark_runner/common/template_operations/templates/hammerdb)
 * [stressng](https://wiki.ubuntu.com/Kernel/Reference/stress-ng): running stressng workload in Pod, Kata or VM [Configuration](benchmark_runner/common/template_operations/templates/stressng)
 * [uperf](http://uperf.org/): running uperf workload in Pod, Kata or VM with [Configuration](benchmark_runner/common/template_operations/templates/uperf)
-* [vdbench](https://wiki.lustre.org/VDBench/): running vdbench workload in Pod, Kata or VM with [Configuration](benchmark_runner/common/template_operations/templates/vdbench)
+* [vdbench](https://wiki.lustre.org/VDBench): running vdbench workload in Pod, Kata or VM with [Configuration](benchmark_runner/common/template_operations/templates/vdbench)
 * [bootstorm](https://en.wiktionary.org/wiki/boot_storm): calculate VMs boot load time [Configuration](benchmark_runner/common/template_operations/templates/bootstorm)
 
 ** For hammerdb mssql must run once [permission](https://github.com/redhat-performance/benchmark-runner/blob/main/benchmark_runner/common/ocp_resources/custom/template/02_mssql_patch_template.sh)

{benchmark_runner-1.0.874 → benchmark_runner-1.0.915}/README.md

@@ -23,7 +23,7 @@ This framework support the following embedded workloads:
 * [hammerdb](https://hammerdb.com/): running hammerdb workload on the following databases: MSSQL, Mariadb, Postgresql in Pod, Kata or VM with [Configuration](benchmark_runner/common/template_operations/templates/hammerdb)
 * [stressng](https://wiki.ubuntu.com/Kernel/Reference/stress-ng): running stressng workload in Pod, Kata or VM [Configuration](benchmark_runner/common/template_operations/templates/stressng)
 * [uperf](http://uperf.org/): running uperf workload in Pod, Kata or VM with [Configuration](benchmark_runner/common/template_operations/templates/uperf)
-* [vdbench](https://wiki.lustre.org/VDBench/): running vdbench workload in Pod, Kata or VM with [Configuration](benchmark_runner/common/template_operations/templates/vdbench)
+* [vdbench](https://wiki.lustre.org/VDBench): running vdbench workload in Pod, Kata or VM with [Configuration](benchmark_runner/common/template_operations/templates/vdbench)
 * [bootstorm](https://en.wiktionary.org/wiki/boot_storm): calculate VMs boot load time [Configuration](benchmark_runner/common/template_operations/templates/bootstorm)
 
 ** For hammerdb mssql must run once [permission](https://github.com/redhat-performance/benchmark-runner/blob/main/benchmark_runner/common/ocp_resources/custom/template/02_mssql_patch_template.sh)

{benchmark_runner-1.0.874 → benchmark_runner-1.0.915}/benchmark_runner/benchmark_operator/benchmark_operator_workloads_operations.py

@@ -462,7 +462,7 @@ class BenchmarkOperatorWorkloadsOperations:
         :return:
         """
         workload_name = self._workload.split('_')
-        if workload_name[0] in self._workloads_odf_pvc:
+        if workload_name[0] in self._workloads_odf_pvc and '_lso' not in self._workload:
             if not self._oc.is_odf_installed():
                 raise ODFNotInstalled(workload=self._workload)
 

{benchmark_runner-1.0.874 → benchmark_runner-1.0.915}/benchmark_runner/common/grafana/update_grafana_latest_value_mappings.py

@@ -1,6 +1,6 @@
 
 import json
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 
 from benchmark_runner.main.environment_variables import environment_variables
 from benchmark_runner.common.elasticsearch.elasticsearch_operations import ElasticSearchOperations
@@ -57,7 +57,7 @@ class UpdateGrafanaLatestValueMappings:
         :return:
         """
         new_versions = {}
-        current_datetime = datetime.now()
+        current_datetime = datetime.now(timezone.utc).replace(tzinfo=None)
         start_datetime = current_datetime - timedelta(days=last_es_fetch_days)
 
         ids = self.elasticsearch.get_index_ids_between_dates(index='ci-status', start_datetime=start_datetime,

{benchmark_runner-1.0.874 → benchmark_runner-1.0.915}/benchmark_runner/common/oc/oc.py

@@ -87,6 +87,23 @@ class OC(SSH):
         """
         return self._ocp_server_version(jsonpath='.status.history[1].version')
 
+    def get_virtctl_version(self):
+        """
+        Returns the virtctl client version as a string.
+        """
+        return self.run('virtctl version | grep "Client Version" | sed -E \'s/.*GitVersion:"([^"]+)".*/\\1/\'').strip()
+
+    def is_virtctl_ge(self, min_version="1.6.0"):
+        """
+        Returns True if virtctl client version >= min_version.
+        Handles pre-release tags like v1.0.0-rc.0.
+        [In virtctl v1.6.0, the SSH command syntax changed from `virtctl ssh user@vmname -n namespace` to `virtctl ssh user@vm/vmname/namespace`]
+        """
+        version = self.get_virtctl_version().lstrip("v").split("-")[0]
+        version_tuple = tuple(map(int, version.split(".")))
+        min_version_tuple = tuple(map(int, min_version.split(".")))
+        return version_tuple >= min_version_tuple
+
     def upgrade_ocp(self, upgrade_ocp_version: str, upgrade_channel: str = 'stable'):
         """
         This method upgrades OCP version with conditional handling for specific versions.
@@ -1331,37 +1348,49 @@ class OC(SSH):
         else:
             return self.run(ssh_vm_cmd)
 
-    def wait_for_vm_access(self, vm_name: str = '', namespace: str = environment_variables.environment_variables_dict['namespace'],
-                        timeout: int = SHORT_TIMEOUT):
+    def _build_virtctl_cmds(self, vm_name: str, namespace: str):
         """
-        This method waits for VM to be accessible via virtctl ssh
-        :param vm_name:
-        :param timeout:
-        :return:
+        Returns a tuple of (virtctl_cmd, check_cmd) for the given VM and namespace,
+        depending on the virtctl version.
         """
-        current_wait_time = 0
-        while timeout <= 0 or current_wait_time <= timeout:
-            check_virtctl_vm_cmd = f"virtctl ssh --local-ssh=true --local-ssh-opts='-o BatchMode=yes' --local-ssh-opts='-o PasswordAuthentication=no' --local-ssh-opts='-o ConnectTimeout=2' root@{vm_name} -n {namespace} 2>&1 |egrep 'denied|verification failed'  && echo 'True' || echo 'False'"
-            if 'True' in self.run(check_virtctl_vm_cmd):
-                return 'True'
-            # sleep for x seconds
+        base = f"virtctl ssh --local-ssh=true --local-ssh-opts='-o BatchMode=yes' " \
+               f"--local-ssh-opts='-o PasswordAuthentication=no' --local-ssh-opts='-o ConnectTimeout=2'"
+
+        if self.is_virtctl_ge(min_version="1.6.0"):
+            virtctl_cmd = f"{base} root@vm/{vm_name}/{namespace}"
+            check_cmd = f"{virtctl_cmd} 2>&1 | egrep 'denied|verification failed' && echo True || echo False"
+        else:
+            virtctl_cmd = f"{base} root@{vm_name} -n {namespace}"
+            check_cmd = f"{virtctl_cmd} 2>&1 | egrep 'denied|verification failed' && echo True || echo False"
+
+        return virtctl_cmd, check_cmd
+
+    def wait_for_vm_access(self, vm_name: str = '',
+                           namespace: str = environment_variables.environment_variables_dict['namespace'],
+                           timeout: int = SHORT_TIMEOUT):
+        """
+        Waits until the VM is accessible via virtctl ssh, or raises VMStateTimeout.
+        """
+        _, check_cmd = self._build_virtctl_cmds(vm_name, namespace)
+        elapsed = 0
+
+        while timeout <= 0 or elapsed <= timeout:
+            if 'True' in self.run(check_cmd):
+                return True
             time.sleep(OC.SLEEP_TIME)
-            current_wait_time += OC.SLEEP_TIME
+            elapsed += OC.SLEEP_TIME
+
         raise VMStateTimeout(vm_name=vm_name, state='virtctl')
 
-    def get_vm_access(self, vm_name: str = '', namespace: str = environment_variables.environment_variables_dict['namespace']):
+    def get_vm_access(self, vm_name: str = '',
+                      namespace: str = environment_variables.environment_variables_dict['namespace']):
         """
-        This method returns True when the VM is access and an error message when it is not, using virtctl protocol
-        :param vm_name:
-        :param namespace:
-        :return: virtctl_status 'True' if successful, or an error message if it fails.
+        Returns True if the VM is accessible via virtctl SSH, or the SSH error output if not.
         """
-        virtctl_vm_cmd = f"virtctl ssh --local-ssh=true --local-ssh-opts='-o BatchMode=yes' --local-ssh-opts='-o PasswordAuthentication=no' --local-ssh-opts='-o ConnectTimeout=2' root@{vm_name} -n {namespace}"
-        check_virtctl_vm_cmd = f"virtctl ssh --local-ssh=true --local-ssh-opts='-o BatchMode=yes' --local-ssh-opts='-o PasswordAuthentication=no' --local-ssh-opts='-o ConnectTimeout=2' root@{vm_name} -n {namespace} 2>&1 |egrep 'denied|verification failed'  && echo 'True' || echo 'False'"
-        if 'True' in self.run(check_virtctl_vm_cmd):
-            return 'True'
-        else:
-            return self.run(virtctl_vm_cmd)
+        virtctl_cmd, check_cmd = self._build_virtctl_cmds(vm_name, namespace)
+        if 'True' in self.run(check_cmd):
+            return True
+        return self.run(virtctl_cmd)
 
     @logger_time_stamp
     def get_vm_node(self, vm_name: str, namespace: str = environment_variables.environment_variables_dict['namespace']):

{benchmark_runner-1.0.874 → benchmark_runner-1.0.915}/benchmark_runner/common/ocp_resources/create_lso.py

@@ -10,11 +10,14 @@ class CreateLSO(CreateOCPResourceOperations):
     """
     This class is created Local Storage operator
     """
-    def __init__(self, oc: OC, path: str, resource_list: list):
+    def __init__(self, oc: OC, path: str, resource_list: list, lso_node: str, lso_disk_id: str, ceph_version: str):
         super().__init__(oc)
         self.__oc = oc
         self.__path = path
         self.__resource_list = resource_list
+        self.__lso_node = lso_node
+        self.__lso_disk_id = lso_disk_id
+        self.__ceph_version = ceph_version
 
     @logger_time_stamp
     def create_lso(self, upgrade_version: str):
@@ -29,7 +32,15 @@ class CreateLSO(CreateOCPResourceOperations):
         else:
             for resource in self.__resource_list:
                 logger.info(f'run {resource}')
-                self.__oc.create_async(yaml=os.path.join(self.__path, resource))
+                if resource.endswith('.sh'):
+                    if '01_delete_disks.sh' == resource and self.__lso_disk_id:
+                        disk = f'/dev/disk/by-id/{self.__lso_disk_id}'
+                        delete_node_disk = f""" podman run --authfile /var/lib/kubelet/config.json --rm --privileged --device "$(readlink -e '{disk}')" --entrypoint ceph-bluestore-tool quay.io/ceph/ceph:v{self.__ceph_version} zap-device --dev "$(readlink -e '{disk}')" --yes-i-really-really-mean-it """
+                        logger.info(f'{self.__lso_node}: {delete_node_disk}')
+                        self.__oc.run(cmd=f'chmod +x {os.path.join(self.__path, resource)}; {self.__path}/{resource} "{self.__lso_node}" "{delete_node_disk}"')
+                else:
+                    logger.info(f'run {resource}')
+                    self.__oc.create_async(yaml=os.path.join(self.__path, resource))
 
             # verify once after create all resource files
             self.wait_for_ocp_resource_create(operator='lso',

{benchmark_runner-1.0.874 → benchmark_runner-1.0.915}/benchmark_runner/common/ocp_resources/create_ocp_resource.py

@@ -24,6 +24,10 @@ class CreateOCPResource:
         self.__oc.populate_additional_template_variables(self.__environment_variables_dict)
         self.__worker_disk_prefix = self.__environment_variables_dict.get('worker_disk_prefix', '')
         self.__worker_disk_ids = self.__environment_variables_dict.get('worker_disk_ids', '')
+        self.__worker_disk_ids = self.__environment_variables_dict.get('worker_disk_ids', '')
+        self.__lso_disk_id = self.__environment_variables_dict.get('lso_disk_id', '')
+        self.__lso_node = self.__environment_variables_dict.get('lso_node', '')
+        self.__ceph_version = self.__environment_variables_dict.get('ceph_version', '')
         if self.__worker_disk_ids:
             if self.__worker_disk_ids:
                 # Solved GitHub Actions issue that env variable detect as string instead of dict/ list -skip for Jenkins
@@ -80,7 +84,7 @@ class CreateOCPResource:
         self.remove_resource_files(path=os.path.join(self.__dir_path, resource))
         resource_files = self.get_sorted_resources(resource=resource)
         if 'lso' == resource:
-            create_lso = CreateLSO(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files)
+            create_lso = CreateLSO(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files, lso_node=self.__lso_node, lso_disk_id=self.__lso_disk_id, ceph_version=self.__ceph_version)
             create_lso.create_lso(upgrade_version)
         elif 'odf' == resource:
             create_odf = CreateODF(self.__oc, path=os.path.join(self.__dir_path, resource), resource_list=resource_files, worker_disk_ids=self.__worker_disk_ids, worker_disk_prefix=self.__worker_disk_prefix)

benchmark_runner-1.0.915/benchmark_runner/common/ocp_resources/lso/template/01_delete_disks_template.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+while (($# >= 2)); do
+    node="$1"
+    delete_disk_command="$2"
+
+    echo "Executing deletion on node: $node"
+
+    oc debug "node/$node" -- chroot /host sh -c "$delete_disk_command"
+
+    shift 2
+done

{benchmark_runner-1.0.874 → benchmark_runner-1.0.915}/benchmark_runner/common/template_operations/templates/hammerdb/internal_data/hammerdb_vm_template.yaml

@@ -11,7 +11,7 @@ spec:
         - key: kubernetes.io/hostname
           operator: In
           values:
-          - {{ pin_node2 }}
+          - {{ lso_node }}
   storageClassDevices:
     - storageClassName: local-sc
       volumeMode: Block
@@ -42,7 +42,11 @@ spec:
     name: hammerdb
     args:
       pin: {{ pin }} # enable for nodeSelector
+      {%- if storage_type == 'lso' %}
+      pin_node: "{{ lso_node }}"
+      {%- else %}
       pin_node: "{{ pin_node2 }}"
+      {%- endif %}
       db_type: "{{ db_type }}"
       timed_test: true
       test_type: "tpc-c"

{benchmark_runner-1.0.874 → benchmark_runner-1.0.915}/benchmark_runner/common/template_operations/templates/hammerdb/internal_data/mariadb_template.yaml

@@ -33,7 +33,7 @@ spec:
         - key: kubernetes.io/hostname
           operator: In
           values:
-          - {{ pin_node2 }}
+          - {{ lso_node }}
   storageClassDevices:
     - storageClassName: local-sc
       volumeMode: Filesystem

{benchmark_runner-1.0.874 → benchmark_runner-1.0.915}/benchmark_runner/common/template_operations/templates/hammerdb/internal_data/mssql_template.yaml

@@ -33,7 +33,7 @@ spec:
         - key: kubernetes.io/hostname
           operator: In
           values:
-          - {{ pin_node2 }}
+          - {{ lso_node }}
   storageClassDevices:
     - storageClassName: local-sc
       volumeMode: Filesystem

{benchmark_runner-1.0.874 → benchmark_runner-1.0.915}/benchmark_runner/common/template_operations/templates/hammerdb/internal_data/postgres_template.yaml

@@ -33,7 +33,7 @@ spec:
         - key: kubernetes.io/hostname
           operator: In
           values:
-          - {{ pin_node2 }}
+          - {{ lso_node }}
   storageClassDevices:
     - storageClassName: local-sc
       volumeMode: Filesystem

{benchmark_runner-1.0.874 → benchmark_runner-1.0.915}/benchmark_runner/main/environment_variables.py

@@ -146,9 +146,11 @@ class EnvironmentVariables:
             else:
                 self._environment_variables_dict['storage_type'] = 'ephemeral'
 
-        # LSO Disk id - auto-detect when located on worker-2
+        # LSO Disk id - auto-detect when located on worker-2, put only the id not full ( i.e. /dev/disk/by-id/{{ lso_disk_id }} )
         self._environment_variables_dict['lso_disk_id'] = EnvironmentVariables.get_env('LSO_DISK_ID', '')
         self._environment_variables_dict['lso_node'] = EnvironmentVariables.get_env('LSO_NODE', '')
+        # Ceph version required for disk cleanup, using default 19
+        self._environment_variables_dict['ceph_version'] = EnvironmentVariables.get_env('CEPH_VERSION', '19')
         # Workloads that required ODF
         self._environment_variables_dict['workloads_odf_pvc'] = ['vdbench', 'hammerdb']
         # This parameter get from Test_CI.yml file

{benchmark_runner-1.0.874 → benchmark_runner-1.0.915}/benchmark_runner/workloads/bootstorm_vm.py

@@ -315,7 +315,9 @@ class BootstormVM(WorkloadsOperations):
             else:
                 self._save_artifacts_local = True
             if self._es_host:
-                self._data_dict.update({'run_artifacts_url': self.get_run_artifacts_google_drive(), 'failure_vms': failure_vms, 'verification_failure': True})
+                if self._google_drive_shared_drive_id:
+                    self._data_dict.update({'run_artifacts_url': self.get_run_artifacts_google_drive()})
+                self._data_dict.update({'failure_vms': failure_vms, 'verification_failure': True})
                 # upload several run results
                 self._upload_to_elasticsearch(index=self._es_index, kind=self._kind, status=self._status,result=self._data_dict)
                 # verify that data upload to elastic search according to unique uuid

{benchmark_runner-1.0.874 → benchmark_runner-1.0.915}/benchmark_runner/workloads/workloads_operations.py

@@ -184,11 +184,11 @@ class WorkloadsOperations:
     @logger_time_stamp
     def odf_workload_verification(self):
         """
-        This method verifies whether the ODF operator is installed for ODF workloads and raises an error if it is missing.
+        This method verifies whether the ODF operator is installed for ODF workloads and raises an error if it is missing, skip for LSO workload
         :return:
         """
         workload_name = self._workload.split('_')
-        if workload_name[0] in self._workloads_odf_pvc:
+        if workload_name[0] in self._workloads_odf_pvc and '_lso' not in self._workload:
             if not self._oc.is_odf_installed():
                 raise ODFNotInstalled(workload=self._workload)
 

{benchmark_runner-1.0.874 → benchmark_runner-1.0.915/benchmark_runner.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: benchmark-runner
-Version: 1.0.874
+Version: 1.0.915
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: attrs==21.4.0
@@ -78,7 +79,7 @@ This framework support the following embedded workloads:
 * [hammerdb](https://hammerdb.com/): running hammerdb workload on the following databases: MSSQL, Mariadb, Postgresql in Pod, Kata or VM with [Configuration](benchmark_runner/common/template_operations/templates/hammerdb)
 * [stressng](https://wiki.ubuntu.com/Kernel/Reference/stress-ng): running stressng workload in Pod, Kata or VM [Configuration](benchmark_runner/common/template_operations/templates/stressng)
 * [uperf](http://uperf.org/): running uperf workload in Pod, Kata or VM with [Configuration](benchmark_runner/common/template_operations/templates/uperf)
-* [vdbench](https://wiki.lustre.org/VDBench/): running vdbench workload in Pod, Kata or VM with [Configuration](benchmark_runner/common/template_operations/templates/vdbench)
+* [vdbench](https://wiki.lustre.org/VDBench): running vdbench workload in Pod, Kata or VM with [Configuration](benchmark_runner/common/template_operations/templates/vdbench)
 * [bootstorm](https://en.wiktionary.org/wiki/boot_storm): calculate VMs boot load time [Configuration](benchmark_runner/common/template_operations/templates/bootstorm)
 
 ** For hammerdb mssql must run once [permission](https://github.com/redhat-performance/benchmark-runner/blob/main/benchmark_runner/common/ocp_resources/custom/template/02_mssql_patch_template.sh)

{benchmark_runner-1.0.874 → benchmark_runner-1.0.915}/benchmark_runner.egg-info/SOURCES.txt

@@ -80,6 +80,7 @@ benchmark_runner/common/ocp_resources/infra/template/01_cluster-monitoring-confi
 benchmark_runner/common/ocp_resources/kata/template/01_operator_template.yaml
 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_delete_disks_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_catalogsource_template.yaml

{benchmark_runner-1.0.874 → benchmark_runner-1.0.915}/setup.py

@@ -4,7 +4,7 @@ from os import path
 from setuptools import setup, find_packages
 
 
-__version__ = '1.0.874'  # update also .bumpversion.cfg
+__version__ = '1.0.915'  # update also .bumpversion.cfg
 
 
 here = path.abspath(path.dirname(__file__))
@@ -34,6 +34,7 @@ setup(
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
     ],
 
     zip_safe=False,
@@ -62,7 +63,7 @@ setup(
         'paramiko==3.4.0',
         'PyGitHub==1.55',  # update secrets
         'PyYAML==6.0.1',
-        'setuptools',  # for python3.12
+        'setuptools',  # for python3.13
         'sphinx==5.0.0',  # readthedocs
         'sphinx-rtd-theme==1.0.0',  # readthedocs
         'tenacity==8.0.1',  # retry decorator