commit 432e9d93da85647b306c7ce0db5ef60ebb273acd
author Jakub Josef <jakub.josef@gmail.com> Tue Feb 06 18:28:37 2018 +0100
committer Jakub Josef <jjosef@mirantis.com> Wed Feb 07 13:10:59 2018 +0000
tree c1cfb34bcb14646e6576078935d39d88e18c708c
parent 638e0bf0916500f743300cb6c75d4b051906036b

Refactoring in salt functions

Complete refactoring of Orchestrate.groovy salt calls, fix bugs and
simplify code.

Change-Id: I5eced97df6b050c74932ea58254a0fa95e3d9849

src/com/mirantis/mk/Test.groovy

diff --git a/src/com/mirantis/mk/Test.groovy b/src/com/mirantis/mk/Test.groovy
index 87f6a56..5a192d3 100644
--- a/src/com/mirantis/mk/Test.groovy
+++ b/src/com/mirantis/mk/Test.groovy
@@ -143,8 +143,7 @@
 def copyTempestResults(master, target) {
     def salt = new com.mirantis.mk.Salt()
     if (! target.contains('cfg')) {
-        salt.runSaltProcessStep(master, "${target}", 'cmd.run', ["mkdir /root/rally_reports/ && " +
-                                                                 "rsync -av /root/rally_reports/ cfg01:/root/rally_reports/"])
+        salt.cmdRun(master, target, "mkdir /root/rally_reports/ && rsync -av /root/rally_reports/ cfg01:/root/rally_reports/")
     }
 }
 
@@ -155,7 +154,7 @@
  */
 def catTestsOutput(master, image) {
     def salt = new com.mirantis.mk.Salt()
-    salt.runSaltProcessStep(master, 'cfg01*', 'cmd.run', ["cat /home/ubuntu/${image}.output"])
+    salt.cmdRun(master, 'cfg01*', "cat /home/ubuntu/${image}.output")
 }
 
 
@@ -165,7 +164,7 @@
  */
 def install_docker(master, target) {
     def salt = new com.mirantis.mk.Salt()
-    salt.runSaltProcessStep(master, "${target}", 'pkg.install', ["docker.io"])
+    salt.runSaltProcessStep(master, target, 'pkg.install', ["docker.io"])
 }
 
 
@@ -197,9 +196,9 @@
                            "-e TEST_GROUP=${testGroup} " +
                            "${image}"
     if (master == null) {
-      sh("${command}")
+      sh(command)
     } else {
-      salt.cmdRun(master, "${target}", "${command}")
+      salt.cmdRun(master, target, command)
     }
 }
 
@@ -216,7 +215,7 @@
     def artifacts_dir = '_artifacts/'
     def output_file = 'rally_reports.tar'
 
-    salt.runSaltProcessStep(master, "${target}", 'cmd.run', ["tar -cf /root/${output_file} -C ${reports_dir} ."])
+    salt.cmdRun(master, target, "tar -cf /root/${output_file} -C ${reports_dir} .")
     sh "mkdir -p ${artifacts_dir}"
 
     encoded = salt.cmdRun(master, target, "cat /root/${output_file}", true, null, false)['return'][0].values()[0].replaceAll('Salt command execution success','')