commit 1c568f9fab3f08adccc6a233ecd39d764f216f93
author Tatyana Leontovich <tleontovich@mirantis.com> Mon Jul 03 15:16:27 2017 +0300
committer Tatyanka Leontovich <tleontovich@mirantis.com> Mon Jul 03 10:49:51 2017 -0400
tree 120b3ba69fd99f7b267602ffacb0058dee984592
parent 0872ec09f00ebe1f2b86e5fce62a6f4290b9ad43

Fix etcd key error problem in nightly runs

Change-Id: Id8658b124727d53bbacf8140bc8a99bebe57ea96
Reviewed-on: https://review.gerrithub.io/367864
Reviewed-by: Tatyanka Leontovich <tleontovich@mirantis.com>
Tested-by: Tatyanka Leontovich <tleontovich@mirantis.com>

tcp_tests/templates/virtual-mcp11-k8s-calico/salt.yaml

diff --git a/tcp_tests/templates/virtual-mcp11-k8s-calico/salt.yaml b/tcp_tests/templates/virtual-mcp11-k8s-calico/salt.yaml
index 4bacd55..2501362 100644
--- a/tcp_tests/templates/virtual-mcp11-k8s-calico/salt.yaml
+++ b/tcp_tests/templates/virtual-mcp11-k8s-calico/salt.yaml
@@ -196,15 +196,27 @@
   retry: {count: 2, delay: 5}
   skip_fail: false
 
+- description: Workaround for PROD-12409
+  cmd: timeout 120 salt --hard-crash --state-output=mixed --state-verbose=False
+    -C 'I@salt:master' saltutil.sync_all;
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 2, delay: 5}
+  skip_fail: false
+
 - description: Run 'salt' formula on cfg01 with workaround proposed in PROD-10894
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
     -C 'I@salt:master' state.sls salt;
-    salt --hard-crash --state-output=mixed --state-verbose=False
-    -C 'I@salt:master' saltutil.sync_all
   node_name: {{ HOSTNAME_CFG01 }}
   retry: {count: 5, delay: 5}
   skip_fail: false
 
+- description: Sync modules after salt execution
+  cmd: timeout 120 salt --hard-crash --state-output=mixed --state-verbose=False
+    -C 'I@salt:master' saltutil.sync_all;
+  node_name: {{ HOSTNAME_CFG01 }}
+  retry: {count: 2, delay: 5}
+  skip_fail: false
+
 - description: Generate inventory for all the nodes to the /srv/salt/reclass/nodes/_generated
   cmd: salt --hard-crash --state-output=mixed --state-verbose=False
     -C 'I@salt:master' state.sls reclass

tcp_tests/tests/system/test_install_k8s.py

diff --git a/tcp_tests/tests/system/test_install_k8s.py b/tcp_tests/tests/system/test_install_k8s.py
index 43980a3..1d5c8c8 100644
--- a/tcp_tests/tests/system/test_install_k8s.py
+++ b/tcp_tests/tests/system/test_install_k8s.py
@@ -36,7 +36,7 @@
             6. Run conformance if need
 
         """
-        if config.k8s_conformance_run:
+        if config.k8s.k8s_conformance_run:
             k8s_actions.run_conformance()
         LOG.info("*************** DONE **************")
 
@@ -52,6 +52,6 @@
             5. Run conformance if need
 
         """
-        if config.k8s_conformance_run:
+        if config.k8s.k8s_conformance_run:
             k8s_actions.run_conformance()
         LOG.info("*************** DONE **************")
\ No newline at end of file