diff --git a/benchmark_runner/common/oc/oc.py b/benchmark_runner/common/oc/oc.py index a3655667..9831948c 100644 --- a/benchmark_runner/common/oc/oc.py +++ b/benchmark_runner/common/oc/oc.py @@ -1407,7 +1407,7 @@ def generate_odf_must_gather(self, destination_path: str = '/tmp', odf_version: odf_version = ".".join(self.get_odf_version().split(".")[:2]) if not odf_version: raise ValueError("ODF version must be provided") - + logger.info(f'odf version: {odf_version}') folder_path = os.path.join(destination_path, f"odf-must-gather-rhel9-v{odf_version}") try: @@ -1437,6 +1437,7 @@ def generate_cnv_must_gather(self, destination_path: str = '/tmp', cnv_version: cnv_version = ".".join(self.get_cnv_version().split(".")[:2]) if not cnv_version: raise ValueError("CNV version must be provided") + logger.info(f'cnv version: {cnv_version}') folder_path = os.path.join(destination_path, f"cnv-must-gather-rhel9-v{cnv_version}") diff --git a/benchmark_runner/workloads/bootstorm_vm.py b/benchmark_runner/workloads/bootstorm_vm.py index 0c71f475..d0869ff6 100644 --- a/benchmark_runner/workloads/bootstorm_vm.py +++ b/benchmark_runner/workloads/bootstorm_vm.py @@ -229,8 +229,8 @@ def _verify_vm_ssh(self): if self._wait_for_upgrade_version: logger.info(f'Cluster is upgraded to: {self._wait_for_upgrade_version}') if failure: - self._oc.generate_cnv_must_gather(destination_path=self._run_artifacts_path) - self._oc.generate_odf_must_gather(destination_path=self._run_artifacts_path) + self._oc.generate_cnv_must_gather(destination_path=self._run_artifacts_path, cnv_version=self._cnv_version) + self._oc.generate_odf_must_gather(destination_path=self._run_artifacts_path, odf_version=self._odf_version) # google drive if self._google_drive_shared_drive_id: self.upload_run_artifacts_to_google_drive() diff --git a/benchmark_runner/workloads/workloads_operations.py b/benchmark_runner/workloads/workloads_operations.py index dcf0470f..3550620d 100644 --- a/benchmark_runner/workloads/workloads_operations.py +++ b/benchmark_runner/workloads/workloads_operations.py @@ -60,6 +60,8 @@ def __init__(self): self._redis = self._environment_variables_dict.get('redis', '') self._threads_limit = self._environment_variables_dict.get('threads_limit', '') self._kata_thread_pool_size = self._environment_variables_dict.get('kata_thread_pool_size', '') + self._cnv_version = self._environment_variables_dict.get('cnv_version', '') + self._odf_version = self._environment_variables_dict.get('odf_version', '') if self._scale: self._scale = int(self._scale) self._scale_nodes = self._environment_variables_dict.get('scale_nodes', '') diff --git a/jenkins/PerfCI_Chaos/04_PerfCI_Chaos_Upgrade_OpenShift_Deployment/Jenkinsfile b/jenkins/PerfCI_Chaos/04_PerfCI_Chaos_Upgrade_OpenShift_Deployment/Jenkinsfile index 2747e3ae..af6eb73e 100644 --- a/jenkins/PerfCI_Chaos/04_PerfCI_Chaos_Upgrade_OpenShift_Deployment/Jenkinsfile +++ b/jenkins/PerfCI_Chaos/04_PerfCI_Chaos_Upgrade_OpenShift_Deployment/Jenkinsfile @@ -211,6 +211,8 @@ END sh """ sudo podman run --rm -t \ -e WORKLOAD='${workload}' \ + -e ODF_VERSION="${ODF_VERSION}" \ + -e CNV_VERSION="${CNV_VERSION}" \ -e WAIT_FOR_UPGRADE_VERSION='${WAIT_FOR_UPGRADE_VERSION}' \ -e KUBEADMIN_PASSWORD='${KUBEADMIN_PASSWORD}' \ -e PIN_NODE_BENCHMARK_OPERATOR='${PIN_NODE_BENCHMARK_OPERATOR}' \