Skip to content

Commit

Permalink
Add previous ocp version only when ocp upgrading (#917)
Browse files Browse the repository at this point in the history
  • Loading branch information
ebattat authored Oct 10, 2024
1 parent 0488ee2 commit 26cc3ec
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions benchmark_runner/workloads/workloads_operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ def __init__(self):
google_drive_credentials=self._google_drive_credentials,
google_drive_token=self._google_drive_token,
google_drive_shared_drive_id=self._google_drive_shared_drive_id)
self._upgrade_ocp_version = self._environment_variables_dict.get('upgrade_ocp_version', '')

def _get_workload_file_name(self, workload):
"""
Expand Down Expand Up @@ -380,7 +381,6 @@ def upload_run_artifacts_to_google_drive(self):
folder_path=str(run_artifacts_hierarchy),
parent_folder_id=self._google_drive_shared_drive_id)


def __get_metadata(self, kind: str = None, status: str = None, result: dict = None) -> dict:
"""
This method returns metadata for a run, optionally updates by runtime kind
Expand All @@ -391,7 +391,7 @@ def __get_metadata(self, kind: str = None, status: str = None, result: dict = No
"""
date_format = '%Y_%m_%d'
metadata = {'ocp_version': self._oc.get_ocp_server_version(),
'previous_ocp_version': self._oc.get_previous_ocp_version(),
'previous_ocp_version': self._oc.get_previous_ocp_version() if self._upgrade_ocp_version else '',
'cnv_version': self._oc.get_cnv_version(),
'kata_version': self._oc.get_kata_operator_version(),
'kata_rpm_version': self._oc.get_kata_rpm_version(node=self._pin_node1),
Expand Down

0 comments on commit 26cc3ec

Please sign in to comment.