Fix incorrect yaml data for BAckup Saltmaster test
Fix pytest options to launch an update from Ceph luminous to nautilus
Add class name to the name of TestRail test result for nosetests.xml
Run Zooper for Opencontrail deployments
Fix assert for Ceph Luminous -> Nautilus
Fix start_job_on_jenkins results in Failover tests for Ceph
PROD-36273
Change-Id: I3af4c124e13d647357c0aaeadff038130c18ee71
diff --git a/tcp_tests/tests/system/test_failover_ceph.py b/tcp_tests/tests/system/test_failover_ceph.py
index 44658ea..a89d711 100644
--- a/tcp_tests/tests/system/test_failover_ceph.py
+++ b/tcp_tests/tests/system/test_failover_ceph.py
@@ -126,31 +126,31 @@
# Run Tempest smoke test suite
show_step(5)
- status = dt.start_job_on_jenkins(
+ job_result, job_description = dt.start_job_on_jenkins(
job_name=self.TEMPEST_JOB_NAME,
job_parameters=self.TEMPEST_JOB_PARAMETERS,
start_timeout=self.JENKINS_START_TIMEOUT,
build_timeout=self.JENKINS_BUILD_TIMEOUT
)
- assert status == 'SUCCESS', (
+ assert job_result == 'SUCCESS', (
"'{0}' job run status is {1} after executing Tempest smoke "
"tests".format(
- self.TEMPEST_JOB_NAME, status)
+ self.TEMPEST_JOB_NAME, job_description)
)
# Run Sanity test
show_step(6)
- status = dt.start_job_on_jenkins(
+ job_result, job_description = dt.start_job_on_jenkins(
job_name=self.SANITY_JOB_NAME,
job_parameters=self.SANITY_JOB_PARAMETERS,
start_timeout=self.JENKINS_START_TIMEOUT,
build_timeout=self.JENKINS_BUILD_TIMEOUT
)
- assert status == 'SUCCESS', (
+ assert job_result == 'SUCCESS', (
"'{0}' job run status is {1} after executing selected sanity "
"tests".format(
- self.SANITY_JOB_NAME, status)
+ self.SANITY_JOB_NAME, job_description)
)
@pytest.mark.grab_versions
@@ -222,31 +222,31 @@
# Run Tempest smoke test suite
show_step(5)
- status = dt.start_job_on_jenkins(
+ job_result, job_description = dt.start_job_on_jenkins(
job_name=self.TEMPEST_JOB_NAME,
job_parameters=self.TEMPEST_JOB_PARAMETERS,
start_timeout=self.JENKINS_START_TIMEOUT,
build_timeout=self.JENKINS_BUILD_TIMEOUT
)
- assert status == 'SUCCESS', (
+ assert job_result == 'SUCCESS', (
"'{0}' job run status is {1} after executing Tempest smoke "
"tests".format(
- self.TEMPEST_JOB_NAME, status)
+ self.TEMPEST_JOB_NAME, job_description)
)
# Run Sanity test
show_step(6)
- status = dt.start_job_on_jenkins(
+ job_result, job_description = dt.start_job_on_jenkins(
job_name=self.SANITY_JOB_NAME,
job_parameters=self.SANITY_JOB_PARAMETERS,
start_timeout=self.JENKINS_START_TIMEOUT,
build_timeout=self.JENKINS_BUILD_TIMEOUT
)
- assert status == 'SUCCESS', (
+ assert job_result == 'SUCCESS', (
"'{0}' job run status is {1} after executing selected sanity "
"tests".format(
- self.SANITY_JOB_NAME, status)
+ self.SANITY_JOB_NAME, job_description)
)
@pytest.mark.grab_versions
@@ -317,31 +317,31 @@
# Run Tempest smoke test suite
show_step(5)
- status = dt.start_job_on_jenkins(
+ job_result, job_description = dt.start_job_on_jenkins(
job_name=self.TEMPEST_JOB_NAME,
job_parameters=self.TEMPEST_JOB_PARAMETERS,
start_timeout=self.JENKINS_START_TIMEOUT,
build_timeout=self.JENKINS_BUILD_TIMEOUT
)
- assert status == 'SUCCESS', (
+ assert job_result == 'SUCCESS', (
"'{0}' job run status is {1} after executing Tempest smoke "
"tests".format(
- self.TEMPEST_JOB_NAME, status)
+ self.TEMPEST_JOB_NAME, job_description)
)
# Run Sanity test
show_step(6)
- status = dt.start_job_on_jenkins(
+ job_result, job_description = dt.start_job_on_jenkins(
job_name=self.SANITY_JOB_NAME,
job_parameters=self.SANITY_JOB_PARAMETERS,
start_timeout=self.JENKINS_START_TIMEOUT,
build_timeout=self.JENKINS_BUILD_TIMEOUT
)
- assert status == 'SUCCESS', (
+ assert job_result == 'SUCCESS', (
"'{0}' job run status is {1} after executing selected sanity "
"tests".format(
- self.SANITY_JOB_NAME, status)
+ self.SANITY_JOB_NAME, job_description)
)
# #######################################################################