Skip to content

Commit a1b9346

Browse files
authored
update centos 9 version (#1160)
1 parent 1f22743 commit a1b9346

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

benchmark_runner/benchmark_operator/benchmark_operator_workloads_operations.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def __init__(self):
8787
self._lso_disk_id = self._environment_variables_dict.get('lso_disk_id', '')
8888
else:
8989
self._lso_disk_id = None
90-
self._versions = self._environment_variables_dict['versions']
90+
self._product_versions = self._environment_variables_dict['product_versions']
9191

9292
def get_oc(self, kubeadmin_password: str = ''):
9393
"""
@@ -239,21 +239,21 @@ def __get_metadata(self, kind: str = None, database: str = None, status: str = N
239239
if run_artifacts_url:
240240
metadata.update({'run_artifacts_url': run_artifacts_url})
241241
if database:
242-
metadata.update({'vm_os_version': self._versions.get('db_vm_os_version', 'centos-stream9')})
243-
metadata.update({'hammerdb_version': self._versions.get('hammerdb', 4.0)})
242+
metadata.update({'vm_os_version': self._product_versions.get('db_vm_os_version', 'centos-stream9')})
243+
metadata.update({'hammerdb_version': self._product_versions.get('hammerdb', 4.0)})
244244
else:
245-
metadata.update({'vm_os_version': self._versions.get('vm_os_version', 'fedora39')})
245+
metadata.update({'vm_os_version': self._product_versions.get('vm_os_version', 'fedora39')})
246246
if uuid:
247247
metadata.update({'uuid': uuid})
248248
if prometheus_result:
249249
metadata.update(prometheus_result)
250250
# for hammerdb
251251
if database == 'mssql':
252-
metadata.update({'db_version': self._versions.get('mssql', 2022)})
252+
metadata.update({'db_version': self._product_versions.get('mssql', 2022)})
253253
elif database == 'postgres':
254-
metadata.update({'db_version': self._versions.get('postgres', 13)})
254+
metadata.update({'db_version': self._product_versions.get('postgres', 13)})
255255
elif database == 'mariadb':
256-
metadata.update({'db_version': self._versions.get('mariadb', 10.5)})
256+
metadata.update({'db_version': self._product_versions.get('mariadb', 10.5)})
257257
return metadata
258258

259259
@logger_time_stamp

benchmark_runner/main/environment_variables.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def __init__(self):
126126
}
127127

128128
# Versions
129-
self._environment_variables_dict['versions'] = {
129+
self._environment_variables_dict['product_versions'] = {
130130
'mssql': 2022,
131131
'postgres': 13,
132132
'mariadb': 10.5,

benchmark_runner/workloads/workloads_operations.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ def __init__(self):
125125
self._upgrade_masters_duration_seconds = self._environment_variables_dict.get('upgrade_masters_duration_seconds', '')
126126
self._upgrade_workers_duration_seconds = self._environment_variables_dict.get('upgrade_workers_duration_seconds', '')
127127
self._run_strategy = self._environment_variables_dict.get('run_strategy', '')
128+
self._product_versions = self._environment_variables_dict['product_versions']
128129

129130
def _get_workload_file_name(self, workload):
130131
"""
@@ -420,7 +421,7 @@ def __get_metadata(self, kind: str = None, status: str = None, result: dict = No
420421
'odf_version': self._oc.get_odf_version(),
421422
'runner_version': self._build_version,
422423
'version': int(self._build_version.split('.')[-1]),
423-
'vm_os_version': 'centos-stream8',
424+
'vm_os_version': self._product_versions.get('db_vm_os_version', 'centos-stream9'),
424425
'ci_date': datetime.datetime.now().strftime(date_format),
425426
'uuid': self._uuid,
426427
'pin_node1': self._pin_node1,

0 commit comments

Comments
 (0)