commit ba39a67cbf2f44975c4fe5c83cf93dab1d5f52da
author chnyda <chnyda@mirantis.com> Thu May 11 07:53:24 2017 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> Thu May 11 07:53:26 2017 +0000
tree 045e60636ccab4270910bdbe56620d3e4a34bfcf
parent ab2f370102b73731ec3694408abf1d5cd69db74a
parent 17d877ced7da93471ec1c2dca19a2ada6e3c153d

Merge "Try to fix salt-models testing"

test-salt-models-pipeline.groovy

diff --git a/test-salt-models-pipeline.groovy b/test-salt-models-pipeline.groovy
index ac145a7..d768ef9 100644
--- a/test-salt-models-pipeline.groovy
+++ b/test-salt-models-pipeline.groovy
@@ -31,10 +31,9 @@
 
 def testMinion(minion, saltOpts)
 {
-  sh("""bash -c ' /srv/salt/scripts/salt-master-init.sh;
+  sh("""bash -c 'source /srv/salt/scripts/salt-master-init.sh;
         export SUDO=sudo;
         export DEBUG=1;
-        bash -v;
         export MASTER_HOSTNAME=${master}; reclass-salt -p ${minion} >  /tmp/${minion}.pillar_verify'""")
 }
 
@@ -60,10 +59,10 @@
 
         // setup iniot and verify salt master and minions
         withEnv(["SUDO=sudo","DEBUG=1", "MASTER_HOSTNAME=${master}"]){
-            sh("bash -c '/srv/salt/scripts/salt-master-init.sh system_config'")
-            sh("bash -c '/srv/salt/scripts/salt-master-init.sh saltmaster_bootstrap'")
-            sh("bash -c '/srv/salt/scripts/salt-master-init.sh saltmaster_init > /tmp/${master}.init'")
-            sh("bash -c '/srv/salt/scripts/salt-master-init.sh verify_salt_master'")
+            sh("bash -c 'source /srv/salt/scripts/salt-master-init.sh; system_config'")
+            sh("bash -c 'source /srv/salt/scripts/salt-master-init.sh; saltmaster_bootstrap'")
+            sh("bash -c 'source /srv/salt/scripts/salt-master-init.sh; saltmaster_init > /tmp/${master}.init'")
+            sh("bash -c 'source /srv/salt/scripts/salt-master-init.sh; verify_salt_master'")
         }
 
         testSteps = [:]