benchmark-runner 1.0.897__tar.gz → 1.0.899__tar.gz

{benchmark_runner-1.0.897/benchmark_runner.egg-info → benchmark_runner-1.0.899}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: benchmark-runner
-Version: 1.0.897
+Version: 1.0.899
 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

{benchmark_runner-1.0.897 → benchmark_runner-1.0.899}/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.897 → benchmark_runner-1.0.899}/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.897 → benchmark_runner-1.0.899}/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.899/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.897 → benchmark_runner-1.0.899}/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

{benchmark_runner-1.0.897 → benchmark_runner-1.0.899}/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.897 → benchmark_runner-1.0.899}/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.897 → benchmark_runner-1.0.899}/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.897 → benchmark_runner-1.0.899}/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.897 → benchmark_runner-1.0.899}/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.897 → benchmark_runner-1.0.899/benchmark_runner.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: benchmark-runner
-Version: 1.0.897
+Version: 1.0.899
 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

{benchmark_runner-1.0.897 → benchmark_runner-1.0.899}/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.897 → benchmark_runner-1.0.899}/setup.py

@@ -4,7 +4,7 @@ from os import path
 from setuptools import setup, find_packages
 
 
-__version__ = '1.0.897'  # update also .bumpversion.cfg
+__version__ = '1.0.899'  # 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