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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: benchmark-runner
-Version: 1.0.874
+Version: 1.0.932
 Summary: Benchmark Runner Tool
 Home-page: https://github.com/redhat-performance/benchmark-runner
 Author: Red Hat
@@ -8,11 +8,11 @@ Author-email: ebattat@redhat.com
 License: Apache License 2.0
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-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
+Classifier: Programming Language :: Python :: 3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: attrs==21.4.0
@@ -78,7 +78,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.932}/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.932}/benchmark_runner/benchmark_operator/benchmark_operator_workloads_operations.py

@@ -87,6 +87,7 @@ class BenchmarkOperatorWorkloadsOperations:
                 self._lso_disk_id = self._environment_variables_dict.get('lso_disk_id', '')
         else:
             self._lso_disk_id = None
+        self._versions = self._environment_variables_dict['versions']
 
     def get_oc(self, kubeadmin_password: str = ''):
         """
@@ -238,20 +239,21 @@ class BenchmarkOperatorWorkloadsOperations:
         if run_artifacts_url:
             metadata.update({'run_artifacts_url': run_artifacts_url})
         if database:
-            metadata.update({'vm_os_version': 'centos-stream8'})
+            metadata.update({'vm_os_version': self._versions.get('db_vm_os_version', 'centos-stream9')})
+            metadata.update({'hammerdb_version': self._versions.get('hammerdb', 4.0)})
         else:
-            metadata.update({'vm_os_version': 'fedora34'})
+            metadata.update({'vm_os_version': self._versions.get('vm_os_version', 'fedora39')})
         if uuid:
             metadata.update({'uuid': uuid})
         if prometheus_result:
             metadata.update(prometheus_result)
         # for hammerdb
         if database == 'mssql':
-            metadata.update({'db_version': 2019})
+            metadata.update({'db_version': self._versions.get('mssql', 2022)})
         elif database == 'postgres':
-            metadata.update({'db_version': 10})
+            metadata.update({'db_version': self._versions.get('postgres', 13)})
         elif database == 'mariadb':
-            metadata.update({'db_version': 10.3})
+            metadata.update({'db_version': self._versions.get('mariadb', 10.5)})
         return metadata
 
     @logger_time_stamp
@@ -462,7 +464,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.932}/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.932}/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.932}/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.932}/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.932/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.932}/benchmark_runner/common/template_operations/template_operations.py

@@ -5,6 +5,8 @@ import yaml
 import sys
 import benchmark_runner
 from multiprocessing import Process
+import multiprocessing
+multiprocessing.set_start_method('fork', force=True)
 
 from jinja2 import Template, TemplateSyntaxError
 from benchmark_runner.common.template_operations.render_yaml_from_template import render_yaml_file

{benchmark_runner-1.0.874 → benchmark_runner-1.0.932}/benchmark_runner/common/template_operations/templates/hammerdb/hammerdb_data_template.yaml

@@ -40,21 +40,21 @@ template_data:
       requests_memory: 16Gi
   extra:
     mariadb:
-      db_image: centos-stream8-mariadb103-container-disk:latest
+      db_image: mariadb10.5-centos9-container-disk:latest
       db_pass: mysql
       db_port: 3306
       db_type: mariadb
       db_user: root
       db_server_pod: mariadb-deployment.mariadb-db
     mssql:
-      db_image: centos-stream8-mssql2019-container-disk:latest
+      db_image: mssql2022-centos9-container-disk:latest
       db_pass: s3curePasswordString
       db_port: 1433
       db_type: mssql
       db_user: SA
       db_server_pod: mssql-deployment.mssql-db
     postgres:
-      db_image: centos-stream8-postgres10-container-disk:latest
+      db_image: postgresql13-centos9-container-disk:latest
       db_pass: postgres
       db_port: 5432
       db_type: pg

{benchmark_runner-1.0.874 → benchmark_runner-1.0.932}/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"
@@ -99,7 +103,7 @@ spec:
         sockets: {{ sockets }}
         cores: {{ cores }}
         threads: 1
-        image: quay.io/cloud-bulldozer/{{ db_image }}
+        image: quay.io/benchmark-runner/{{ db_image }}
         limits:
           memory: {{ vm_limits_memory }}
         requests:

{benchmark_runner-1.0.874 → benchmark_runner-1.0.932}/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
@@ -72,16 +72,39 @@ data:
         # use it for options that affect everything
         #
         [client-server]
-        #
-        # include all files from the config directory
-        #
         !includedir /etc/my.cnf.d
         port=3306
         ssl=0
+
         [mysqld]
-        innodb_file_per_table=1
-        innodb_flush_method=O_DIRECT
-        innodb_adaptive_flushing=1
+        key_buffer_size = 1638M
+        max_allowed_packet = 200M
+        table_open_cache = 400
+        sort_buffer_size = 256K
+        read_buffer_size = 16M   # safer per-connection buffer
+        read_rnd_buffer_size = 256K
+        net_buffer_length = 2K
+        thread_stack = 256K
+        myisam_sort_buffer_size = 2M
+        max_connections = 151
+
+        innodb_buffer_pool_size = 8192M
+        innodb_log_file_size = 2457M
+        innodb_log_buffer_size = 2457M
+        innodb_file_per_table = 1
+        innodb_flush_method = O_DIRECT
+        innodb_adaptive_flushing = 1
+
+        [mysqldump]
+        quick
+        max_allowed_packet = 16M
+
+        [mysql]
+        no-auto-rehash
+
+        [myisamchk]
+        key_buffer_size = 8M
+        sort_buffer_size = 8M
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -113,8 +136,8 @@ spec:
       terminationGracePeriodSeconds: 10
       containers:
       - name: mariadb
-        # docker.io/centos/mariadb-103-centos8:latest - rate limit issue
-        image: quay.io/ebattat/mariadb-103-centos8
+        # quay.io/sclorg/mariadb-105-c9s:latest - rate limit issue
+        image: quay.io/benchmark-runner/mariadb10.5-centos9:latest
         imagePullPolicy: "IfNotPresent"
         ports:
         - containerPort: 3306

{benchmark_runner-1.0.874 → benchmark_runner-1.0.932}/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
@@ -92,8 +92,8 @@ spec:
       terminationGracePeriodSeconds: 10
       containers:
       - name: mssql
-        # mcr.microsoft.com/mssql/rhel/server:2019-latest - rate limit issue
-        image: quay.io/ebattat/server:2019-latest
+        # mcr.microsoft.com/mssql/rhel/server:2022-latest - rate limit issue
+        image: quay.io/benchmark-runner/mssql2022-rhel9:latest
         imagePullPolicy: "IfNotPresent"
         ports:
         - containerPort: 1433

{benchmark_runner-1.0.874 → benchmark_runner-1.0.932}/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
@@ -107,8 +107,8 @@ spec:
       terminationGracePeriodSeconds: 10
       containers:
         - name: postgres
-          # docker.io/centos/postgresql-10-centos8:latest - rate limit issue
-          image: quay.io/ebattat/postgresql-10-centos8:latest
+          # quay.io/sclorg/postgresql-13-c9s:latest - rate limit issue
+          image: quay.io/benchmark-runner/postgresql13-centos9:latest
           imagePullPolicy: "IfNotPresent"
           ports:
             - containerPort: 5432

{benchmark_runner-1.0.874 → benchmark_runner-1.0.932}/benchmark_runner/common/template_operations/templates/stressng/internal_data/stressng_pod_template.yaml

@@ -24,6 +24,7 @@ spec:
       {%- endif %}
       pin: {{ pin }} # enable for nodeSelector
       pin_node: "{{ pin_node }}"
+      image: "quay.io/benchmark-runner/stressng:latest"
       resources: {{ resources }} # enable for resources requests/limits
       requests_cpu: {{ requests_cpu }}
       requests_memory: {{ requests_memory }}

{benchmark_runner-1.0.874 → benchmark_runner-1.0.932}/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/ebattat/fedora37-container-disk:latest
+        image: {{ fedora_container_disk }}
         limits:
           memory: {{ limits_memory }}
         requests:

{benchmark_runner-1.0.874 → benchmark_runner-1.0.932}/benchmark_runner/common/template_operations/templates/uperf/internal_data/uperf_pod_template.yaml

@@ -37,6 +37,7 @@ spec:
       pin: {{ pin }}
       pin_server: "{{ pin_server }}"
       pin_client: "{{ pin_client }}"
+      image: "quay.io/benchmark-runner/uperf:latest"
       serviceip: {{ serviceip }}
       hostnetwork: {{ hostnetwork }}
       networkpolicy: {{ networkpolicy }}

{benchmark_runner-1.0.874 → benchmark_runner-1.0.932}/benchmark_runner/common/template_operations/templates/uperf/internal_data/uperf_vm_template.yaml

@@ -53,7 +53,7 @@ spec:
        sockets: {{ sockets }}
        cores: {{ cores }}
        threads: 1
-       image: quay.io/ebattat/fedora37-container-disk:latest
+       image: {{ fedora_container_disk }}
        limits:
          memory: {{ limits_memory }}
        requests:

{benchmark_runner-1.0.874 → benchmark_runner-1.0.932}/benchmark_runner/common/template_operations/templates/vdbench/internal_data/vdbench_pod_template.yaml

@@ -96,7 +96,6 @@ spec:
   containers:
     - name: vdbench-pod
       image: {{ vdbench_image }}
-      imagePullPolicy: "IfNotPresent"
       resources:
         requests:
           cpu: {{ requests_cpu }}
@@ -167,7 +166,7 @@ spec:
           value: "{{ timeout }}"
       command: ["/bin/bash"]
       {% if scale -%}
-      args: ["-c", "python3.9 /state_signals_responder.py $REDIS_HOST $WORKLOAD_METHOD $TIMEOUT"]
+      args: ["-c", "python3.12 /state_signals_responder.py $REDIS_HOST $WORKLOAD_METHOD $TIMEOUT"]
       {%- else -%}
       args: ["-c", "$WORKLOAD_METHOD"]
       {%- endif %}

{benchmark_runner-1.0.874 → benchmark_runner-1.0.932}/benchmark_runner/common/template_operations/templates/vdbench/internal_data/vdbench_vm_template.yaml

@@ -121,7 +121,7 @@ spec:
                 - export LOGS_DIR={{ LOGS_DIR }}
                 - echo @@~@@START-WORKLOAD@@~@@
                 {% if scale -%}
-                - podman run --rm -e BLOCK_SIZES="$BLOCK_SIZES" -e IO_OPERATION="$IO_OPERATION" -e IO_THREADS="$IO_THREADS" -e FILES_IO="$FILES_IO" -e IO_RATE="$IO_RATE" -e  MIX_PRECENTAGE="$MIX_PRECENTAGE" -e DURATION="$DURATION" -e  PAUSE="$PAUSE" -e WARMUP="$WARMUP" -e FILES_SELECTION="$FILES_SELECTION" -e COMPRESSION_RATIO="$COMPRESSION_RATIO" -e RUN_FILLUP="$RUN_FILLUP" -e DIRECTORIES="$DIRECTORIES" -e FILES_PER_DIRECTORY="$FILES_PER_DIRECTORY" -e SIZE_PER_FILE="$SIZE_PER_FILE" -e REDIS_HOST="$REDIS_HOST" -e LOGS_DIR="$LOGS_DIR" -e TIMEOUT="$TIMEOUT" -v "/workload":"/workload" --privileged {{ vdbench_image }} python3.9 /state_signals_responder.py "$REDIS_HOST" "$WORKLOAD_METHOD" "$TIMEOUT"
+                - podman run --rm -e BLOCK_SIZES="$BLOCK_SIZES" -e IO_OPERATION="$IO_OPERATION" -e IO_THREADS="$IO_THREADS" -e FILES_IO="$FILES_IO" -e IO_RATE="$IO_RATE" -e  MIX_PRECENTAGE="$MIX_PRECENTAGE" -e DURATION="$DURATION" -e  PAUSE="$PAUSE" -e WARMUP="$WARMUP" -e FILES_SELECTION="$FILES_SELECTION" -e COMPRESSION_RATIO="$COMPRESSION_RATIO" -e RUN_FILLUP="$RUN_FILLUP" -e DIRECTORIES="$DIRECTORIES" -e FILES_PER_DIRECTORY="$FILES_PER_DIRECTORY" -e SIZE_PER_FILE="$SIZE_PER_FILE" -e REDIS_HOST="$REDIS_HOST" -e LOGS_DIR="$LOGS_DIR" -e TIMEOUT="$TIMEOUT" -v "/workload":"/workload" --privileged {{ vdbench_image }} python3.12 /state_signals_responder.py "$REDIS_HOST" "$WORKLOAD_METHOD" "$TIMEOUT"
                 {%- else -%}
                 - podman run --rm -e BLOCK_SIZES="$BLOCK_SIZES" -e IO_OPERATION="$IO_OPERATION" -e IO_THREADS="$IO_THREADS" -e FILES_IO="$FILES_IO" -e IO_RATE="$IO_RATE" -e MIX_PRECENTAGE="$MIX_PRECENTAGE" -e DURATION="$DURATION" -e PAUSE="$PAUSE" -e WARMUP="$WARMUP" -e FILES_SELECTION="$FILES_SELECTION" -e COMPRESSION_RATIO="$COMPRESSION_RATIO" -e RUN_FILLUP="$RUN_FILLUP" -e DIRECTORIES="$DIRECTORIES" -e FILES_PER_DIRECTORY="$FILES_PER_DIRECTORY" -e SIZE_PER_FILE="$SIZE_PER_FILE" -e REDIS_HOST="$REDIS_HOST" -e LOGS_DIR="$LOGS_DIR" -e TIMEOUT="$TIMEOUT" -v "/workload":"/workload" --privileged {{ vdbench_image }} "$WORKLOAD_METHOD"
                 {%- endif %}

{benchmark_runner-1.0.874 → benchmark_runner-1.0.932}/benchmark_runner/common/template_operations/templates/vdbench/vdbench_data_template.yaml

@@ -5,8 +5,8 @@ template_data:
     pin_node: {{ pin_node1 }}
     odf_pvc: {{ odf_pvc }}
     uuid: {{ uuid }}
-    vdbench_image: quay.io/ebattat/centos-stream8-vdbench5.04.07-pod:v1.0.13
-    centos_stream_container_disk: quay.io/ebattat/centos-stream8-container-disk:latest
+    vdbench_image: quay.io/benchmark-runner/centos-stream9-vdbench5.04.07-pod:latest
+    centos_stream_container_disk: quay.io/benchmark-runner/centos-stream9-container-disk:latest
   run_type:
     perf_ci:
       BLOCK_SIZES: oltp1,oltp2,oltphw,odss2,odss128,4_cache,64_cache,4,64,4_cache,64_cache,4,64

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

@@ -84,8 +84,8 @@ class EnvironmentVariables:
         # prometheus snap interval
         self._environment_variables_dict['prometheus_snap_interval'] = EnvironmentVariables.get_env('PROMETHEUS_SNAP_INTERVAL', '30')
 
-        # fedora container disk qcow2 image on quay.io
-        self._environment_variables_dict['fedora_container_disk'] = EnvironmentVariables.get_env('FEDORA_CONTAINER_DISK','quay.io/ebattat/fedora37-container-disk:latest')
+        # based on: quay.io/openshift-cnv/qe-cnv-tests-fedora:39
+        self._environment_variables_dict['fedora_container_disk'] = EnvironmentVariables.get_env('FEDORA_CONTAINER_DISK','quay.io/benchmark-runner/fedora39-container-disk:latest')
         # windows url
         self._environment_variables_dict['windows_url'] = EnvironmentVariables.get_env('WINDOWS_URL', '')
         # Delete all resources before and after the run, default True
@@ -125,6 +125,16 @@ class EnvironmentVariables:
             'krknhub': 'krknhub',
         }
 
+        # Versions
+        self._environment_variables_dict['versions'] = {
+            'mssql': 2022,
+            'postgres': 13,
+            'mariadb': 10.5,
+            'db_vm_os_version': 'centos-stream9',
+            'vm_os_version': 'fedora39',
+            'hammerdb': 4.0
+        }
+
         # Update namespace
         base_workload = self._environment_variables_dict['workload'].split('_')[0]
         if EnvironmentVariables.get_env('NAMESPACE'):
@@ -146,9 +156,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.932}/benchmark_runner/main/main.py

@@ -1,7 +1,7 @@
 
 import ast  # change string list to list
 from enum import Enum
-from multiprocessing import set_start_method
+import multiprocessing
 import platform
 
 # @todo paramiko==3.4.1/3.5.0 cause to "RunCommandError: Cannot run shell command: SSH session not active"
@@ -20,7 +20,6 @@ from benchmark_runner.common.clouds.BareMetal.bare_metal_operations import BareM
 from benchmark_runner.clusterbuster.clusterbuster_workloads import ClusterBusterWorkloads
 from benchmark_runner.krkn_hub.krknhub_workloads import KrknHubWorkloads
 
-
 # logger
 log_level = os.environ.get('log_level', 'INFO').upper()
 logger.setLevel(level=log_level)
@@ -326,5 +325,6 @@ def main():
 if __name__ == '__main__':
     # spawn default in mac: https://docs.python.org/3/library/multiprocessing.html#:~:text=The%20default%20on%20Windows%20and%20macOS.
     if 'macos' in platform.platform(terse=True).lower():
-        set_start_method('fork')
+        if multiprocessing.get_start_method(allow_none=True) is None:
+            multiprocessing.set_start_method('fork')
     main()

{benchmark_runner-1.0.874 → benchmark_runner-1.0.932}/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.932}/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)