Fix test_upgrade_pike_queens test for different configurations
- Execute steps of upgrading kmn* and mdb* role nodes only
if they are indeed present in the environment.
- Additionally proper target version of gnocchi for upgrade
is set.
Change-Id: Icb83c3f02aa25f4c9b19620cd4516dd5e8869aa8
Fixes-Prod:PROD-34781
diff --git a/tcp_tests/tests/system/test_upgrade_pike_queens.py b/tcp_tests/tests/system/test_upgrade_pike_queens.py
index 57ee701..aed97b0 100644
--- a/tcp_tests/tests/system/test_upgrade_pike_queens.py
+++ b/tcp_tests/tests/system/test_upgrade_pike_queens.py
@@ -137,7 +137,7 @@
openstack_init_yaml = "cluster/*/openstack/init.yml"
LOG.info('Add parameters to {}'.format(openstack_init_yaml))
reclass_actions.add_key('parameters._param.gnocchi_version',
- 4.2,
+ 5.0,
openstack_init_yaml)
reclass_actions.add_key('parameters._param.gnocchi_old_version',
4.0,
@@ -198,19 +198,21 @@
job_parameters=job_parameters)
assert update_control_vms == 'SUCCESS'
- # ####### Run job for mdb* ###
- job_parameters["TARGET_SERVERS"] = "mdb*"
- update_control_vms = dt.start_job_on_jenkins(
- job_name=job_name,
- job_parameters=job_parameters)
- assert update_control_vms == 'SUCCESS'
+ if salt_actions.cmd_run("mdb*", "test.ping")[0].keys():
+ # ####### Run job for mdb* ###
+ job_parameters["TARGET_SERVERS"] = "mdb*"
+ update_control_vms = dt.start_job_on_jenkins(
+ job_name=job_name,
+ job_parameters=job_parameters)
+ assert update_control_vms == 'SUCCESS'
- # ####### Run job for kmn* ###
- job_parameters["TARGET_SERVERS"] = "kmn*"
- update_control_vms = dt.start_job_on_jenkins(
- job_name=job_name,
- job_parameters=job_parameters)
- assert update_control_vms == 'SUCCESS'
+ if salt_actions.cmd_run("kmn*", "test.ping")[0].keys():
+ # ####### Run job for kmn* ###
+ job_parameters["TARGET_SERVERS"] = "kmn*"
+ update_control_vms = dt.start_job_on_jenkins(
+ job_name=job_name,
+ job_parameters=job_parameters)
+ assert update_control_vms == 'SUCCESS'
# ####### Run job for prx* ###
job_parameters["TARGET_SERVERS"] = "prx*"