The reason of failed jenkins job in cluster-under-test will be shown in a test result
PROD-36050
Change-Id: I1160d46e99751f4e714c459e3d07110958c913e3
diff --git a/tcp_tests/tests/system/test_mcp_update.py b/tcp_tests/tests/system/test_mcp_update.py
index 23cd61f..72ed442 100644
--- a/tcp_tests/tests/system/test_mcp_update.py
+++ b/tcp_tests/tests/system/test_mcp_update.py
@@ -189,12 +189,12 @@
job_parameters = {
'BRANCHES': 'release/proposed/2019.2.0'
}
- update_pipelines = dt.start_job_on_jenkins(
+ job_result, job_description = dt.start_job_on_jenkins(
job_name=job_name,
job_parameters=job_parameters,
verbose=True)
- assert update_pipelines == 'SUCCESS'
+ assert job_result == 'SUCCESS', job_description
# ################### Downstream pipeline-library ####################
show_step(3)
@@ -202,12 +202,12 @@
job_parameters = {
'BRANCHES': 'release/proposed/2019.2.0'
}
- update_pipeline_library = dt.start_job_on_jenkins(
+ job_result, job_description = dt.start_job_on_jenkins(
job_name=job_name,
job_parameters=job_parameters,
verbose=True)
- assert update_pipeline_library == 'SUCCESS'
+ assert job_result == 'SUCCESS', job_description
# ################### Start 'Deploy - upgrade MCP Drivetrain' job #####
show_step(4)
@@ -218,13 +218,13 @@
'MK_PIPELINES_REFSPEC': 'release/proposed/2019.2.0',
'TARGET_MCP_VERSION': '2019.2.0'
}
- update_drivetrain = dt.start_job_on_jenkins(
+ job_result, job_description = dt.start_job_on_jenkins(
job_name=job_name,
job_parameters=job_parameters,
verbose=True,
build_timeout=3 * 60 * 60)
- assert update_drivetrain == 'SUCCESS'
+ assert job_result == 'SUCCESS', job_description
@pytest.mark.grab_versions
@pytest.mark.parametrize("_", [settings.ENV_NAME])
@@ -259,11 +259,11 @@
show_step(3)
job_name = 'update-glusterfs'
- update_glusterfs = dt.start_job_on_jenkins(
+ job_result, job_description = dt.start_job_on_jenkins(
job_name=job_name,
build_timeout=40 * 60)
- assert update_glusterfs == 'SUCCESS'
+ assert job_result == 'SUCCESS', job_description
# ################ Check GlusterFS version for servers ##############
show_step(4)
@@ -331,12 +331,12 @@
'INTERACTIVE': 'false'
}
- update_galera = dt.start_job_on_jenkins(
+ job_result, job_description = dt.start_job_on_jenkins(
job_name=job_name,
job_parameters=job_parameters,
build_timeout=40 * 60)
- assert update_galera == 'SUCCESS'
+ assert job_result == 'SUCCESS', job_description
@pytest.fixture
def disable_automatic_failover_neutron_for_test(self, salt_actions):
@@ -465,12 +465,12 @@
'INTERACTIVE': 'false'
}
- update_rabbit = dt.start_job_on_jenkins(
+ job_result, job_description = dt.start_job_on_jenkins(
job_name='deploy-upgrade-rabbitmq',
job_parameters=job_parameters,
build_timeout=40 * 60
)
- assert update_rabbit == 'SUCCESS'
+ assert job_result == 'SUCCESS', job_description
@pytest.mark.grab_versions
@pytest.mark.parametrize("_", [settings.ENV_NAME])
@@ -496,11 +496,11 @@
show_step(2)
job_parameters = {}
- update_ceph = dt.start_job_on_jenkins(
+ job_result, job_description = dt.start_job_on_jenkins(
job_name='ceph-update',
job_parameters=job_parameters)
- assert update_ceph == 'SUCCESS'
+ assert job_result == 'SUCCESS', job_description
# ########## Verify Ceph version #####################################
show_step(3)
@@ -526,11 +526,11 @@
"STAGE_UPGRADE_ES_KIBANA": True,
"STAGE_UPGRADE_SYSTEM_PART": True
}
- upgrade_control_pipeline = drivetrain.start_job_on_jenkins(
+ job_result, job_description = drivetrain.start_job_on_jenkins(
job_name="stacklight-upgrade",
job_parameters=job_parameters)
- assert upgrade_control_pipeline == 'SUCCESS'
+ assert job_result == 'SUCCESS', job_description
@pytest.mark.usefixtures("switch_to_proposed_pipelines",
@@ -579,11 +579,11 @@
"UPGRADE_SALTSTACK": False,
"OS_UPGRADE": True,
"INTERACTIVE": False}
- upgrade_control_pipeline = drivetrain_actions.start_job_on_jenkins(
+ job_result, job_description = drivetrain_actions.start_job_on_jenkins(
job_name="deploy-upgrade-control",
job_parameters=job_parameters)
- assert upgrade_control_pipeline == 'SUCCESS'
+ assert job_result == 'SUCCESS', job_description
@pytest.mark.grab_versions
@pytest.mark.run_mcp_update
@@ -596,11 +596,11 @@
"OS_DIST_UPGRADE": True,
"OS_UPGRADE": True,
"INTERACTIVE": False}
- upgrade_data_pipeline = drivetrain_actions.start_job_on_jenkins(
+ job_result, job_description = drivetrain_actions.start_job_on_jenkins(
job_name="deploy-upgrade-ovs-gateway",
job_parameters=job_parameters)
- assert upgrade_data_pipeline == 'SUCCESS'
+ assert job_result == 'SUCCESS', job_description
@pytest.mark.grab_versions
@pytest.mark.run_mcp_update
@@ -611,8 +611,8 @@
"OS_DIST_UPGRADE": True,
"OS_UPGRADE": True,
"INTERACTIVE": False}
- upgrade_compute_pipeline = drivetrain_actions.start_job_on_jenkins(
+ job_result, job_description = drivetrain_actions.start_job_on_jenkins(
job_name="deploy-upgrade-compute",
job_parameters=job_parameters)
- assert upgrade_compute_pipeline == 'SUCCESS'
+ assert job_result == 'SUCCESS', job_description