Add 2 retry workaround for sparadic fail

-test_upgrade_pike_queens
-retry upgrade ctl,gtw,cmp

Change-Id: If47cddbf9b19dfb077a4404d79f464075e8e54c3
diff --git a/tcp_tests/tests/system/test_mcp_update.py b/tcp_tests/tests/system/test_mcp_update.py
index 15a0586..747ceda 100644
--- a/tcp_tests/tests/system/test_mcp_update.py
+++ b/tcp_tests/tests/system/test_mcp_update.py
@@ -4,6 +4,7 @@
 
 from tcp_tests import logger
 from tcp_tests import settings
+from retrying import retry
 
 sys.path.append(os.getcwd())
 try:
@@ -735,6 +736,7 @@
         r, errors = salt.enforce_state("I@jenkins:client", "jenkins.client")
         assert errors is None
 
+    @retry(AssertionError, stop_max_attempt_number=2, wait_fixed=5000)
     @pytest.mark.grab_versions
     @pytest.mark.parametrize('target', get_control_plane_targets())
     @pytest.mark.run_mcp_update
@@ -753,6 +755,7 @@
 
         assert job_result == 'SUCCESS', job_description
 
+    @retry(AssertionError, stop_max_attempt_number=2, wait_fixed=5000)
     @pytest.mark.grab_versions
     @pytest.mark.run_mcp_update
     def test__update__data_plane(self, drivetrain_actions, salt_actions):
@@ -770,6 +773,7 @@
 
         assert job_result == 'SUCCESS', job_description
 
+    @retry(AssertionError, stop_max_attempt_number=2, wait_fixed=5000)
     @pytest.mark.grab_versions
     @pytest.mark.run_mcp_update
     def test__update__computes(self, drivetrain_actions):