commit cbff233aa499bc6eae72f65eda9d113136a65a15
author dtsapikov <dtsapikov@mirantis.com> Wed Jan 19 19:32:22 2022 +0400
committer dtsapikov <dtsapikov@mirantis.com> Thu Jan 20 17:02:27 2022 +0400
tree 78decaeec8b5e47a7d40a4717695f3b66cfb36f7
parent d81c7ae73330f2c8d04c1333af835d8bd4ded1b0

Add pre-update verify step in update test
Related-Prod:PROD-36635

Change-Id: I6a1b43dcec0c48f5b2205851ff4426ac92ac9118

tcp_tests/managers/drivetrain_manager.py

diff --git a/tcp_tests/managers/drivetrain_manager.py b/tcp_tests/managers/drivetrain_manager.py
index dbc5096..2f23df2 100644
--- a/tcp_tests/managers/drivetrain_manager.py
+++ b/tcp_tests/managers/drivetrain_manager.py
@@ -121,3 +121,17 @@
         jenkins_pass = self._salt.get_single_pillar(
             tgt=tgt, pillar="jenkins:client:master:password")
         return jenkins_url, jenkins_user, jenkins_pass
+
+    def check_job_exists_on_jenkins(
+            self,
+            job_name,
+            jenkins_tgt='I@docker:client:stack:jenkins and cid01*'
+            ):
+        jenkins_url, jenkins_user, jenkins_pass = self.get_jenkins_creds(
+            tgt=jenkins_tgt)
+
+        jenkins = client.JenkinsClient(host=jenkins_url,
+                                       username=jenkins_user,
+                                       password=jenkins_pass)
+        result = jenkins.find_jobs(job_name)
+        return result

tcp_tests/tests/system/test_mcp_update.py

diff --git a/tcp_tests/tests/system/test_mcp_update.py b/tcp_tests/tests/system/test_mcp_update.py
index 74f2f95..641edcc 100644
--- a/tcp_tests/tests/system/test_mcp_update.py
+++ b/tcp_tests/tests/system/test_mcp_update.py
@@ -206,8 +206,9 @@
             1. Add workaround for PROD-32751
             2. Run job git-mirror-downstream-mk-pipelines
             3. Run job git-mirror-downstream-pipeline-library
-            4. If jobs are passed then start 'Deploy - upgrade MCP Drivetrain'
-            5. Wait till salt-master completes all async jobs
+            4. Run job pre-upgrade-verify
+            5. If jobs are passed then start 'Deploy - upgrade MCP Drivetrain'
+            6. Wait till salt-master completes all async jobs
 
         Duration: ~70 min
         """
@@ -249,8 +250,23 @@
 
         assert job_result == 'SUCCESS', job_description
 
-        # ################### Start 'Deploy - upgrade MCP Drivetrain' job #####
+        # ############### Start 'Pre-upgrade verify' job (since 2019.2.17)#####
         show_step(4)
+        job_name = 'pre-upgrade-verify'
+        job_parameters = {}
+
+        if(dt.check_job_exists_on_jenkins(job_name)):
+            LOG.info("Pre-upgrade verify job exists on Jenkins!")
+            job_result, job_description = dt.start_job_on_jenkins(
+                job_name=job_name,
+                job_parameters=job_parameters,
+                verbose=True,
+                build_timeout=4 * 60 * 60)
+
+            assert job_result == 'SUCCESS', job_description
+
+        # ################### Start 'Deploy - upgrade MCP Drivetrain' job #####
+        show_step(5)
 
         job_name = 'upgrade-mcp-release'
         job_parameters = {