commit 950468858ee16c02fa3a6e1ec65c201b6cf66df4
author Victor Ryzhenkin <vryzhenkin@mirantis.com> Sat Dec 29 19:18:40 2018 +0400
committer Victor Ryzhenkin <vryzhenkin@mirantis.com> Sat Dec 29 20:03:39 2018 +0400
tree 83aadebc3846aa78e8a363e5f15280e6777b59aa
parent 57c4320ce66aad3b995750151b70b1513edec912

Use salt for file management

Change-Id: I29fec2e91d86a14ea581d7596bc00b1dd881002f

tcp_tests/managers/k8smanager.py

diff --git a/tcp_tests/managers/k8smanager.py b/tcp_tests/managers/k8smanager.py
index 2aea092..d229e2f 100644
--- a/tcp_tests/managers/k8smanager.py
+++ b/tcp_tests/managers/k8smanager.py
@@ -356,11 +356,11 @@
             raise RuntimeError("Conformance failed")
 
     def move_file_to_root_folder(self, filepath):
-        cmd = "mv {0} /root/".format(filepath)
+        # Using || true to avoid salt fails if no file found
+        cmd = "mv {0} /root/ || true".format(filepath)
         if self.conformance_node:
-            self.__underlay.check_call(
-                cmd=cmd, node_name=self.conformance_node,
-                raise_on_err=False)
+            LOG.info("Managing results on {}".format(self.conformance_node))
+            self._salt.cmd_run(tgt=self.conformance_node, cmd=cmd)
         else:
             LOG.info("Node is not properly set")
 
@@ -437,18 +437,17 @@
         else:
             node = self.controller_name
         LOG.info("Trying to combine xunit at {}".format(node))
-        with self.__underlay.remote(node_name=node) as r:
-            cmd = ("apt-get install python-setuptools -y; "
-                   "pip install "
-                   "https://github.com/mogaika/xunitmerge/archive/master.zip")
-            LOG.debug('Installing xunitmerge')
-            r.check_call(cmd, raise_on_err=False)
-            LOG.debug('Merging xunit')
-            cmd = ("cd {0}; arg=''; "
-                   "for i in $(ls | grep xml); "
-                   "do arg=\"$arg $i\"; done && "
-                   "xunitmerge $arg {1}".format(path, output))
-            r.check_call(cmd, raise_on_err=False)
+        cmd = ("apt-get install python-setuptools -y; "
+               "pip install "
+               "https://github.com/mogaika/xunitmerge/archive/master.zip")
+        LOG.debug('Installing xunitmerge')
+        self._salt.cmd_run(tgt=node, cmd=cmd)
+        LOG.debug('Merging xunit')
+        cmd = ("cd {0}; arg=''; "
+               "for i in $(ls | grep xml); "
+               "do arg=\"$arg $i\"; done && "
+               "xunitmerge $arg {1} || true".format(path, output))
+        self._salt.cmd_run(tgt=node, cmd=cmd)
 
     def manage_cncf_archive(self):
         """

tcp_tests/managers/saltmanager.py

diff --git a/tcp_tests/managers/saltmanager.py b/tcp_tests/managers/saltmanager.py
index a468b02..8ef817a 100644
--- a/tcp_tests/managers/saltmanager.py
+++ b/tcp_tests/managers/saltmanager.py
@@ -248,6 +248,10 @@
         result = self.local(tgt=tgt, fun='service.stop', args=service)
         return result['return']
 
+    def cmd_run(self, tgt, cmd):
+        result = self.local(tgt=tgt, fun='cmd.run', args=cmd)
+        return result['return']
+
     @utils.retry(3, exception=libpepper.PepperException)
     def sync_time(self, tgt='*'):
         LOG.info("NTP time sync on the salt minions '{0}'".format(tgt))