Replaced hard kill of salt-master with cleaner way
Change-Id: Iaa46014049ef3a585698634505ae365ba6e5ef20
diff --git a/src/com/mirantis/mk/SaltModelTesting.groovy b/src/com/mirantis/mk/SaltModelTesting.groovy
index 6f67da1..7ff7fbd0 100644
--- a/src/com/mirantis/mk/SaltModelTesting.groovy
+++ b/src/com/mirantis/mk/SaltModelTesting.groovy
@@ -76,8 +76,7 @@
-t \"\$s\" git+https://github.com/salt-formulas/reclass.git;
done""")
sh("timeout ${testTimeout} bash -c 'source /srv/salt/scripts/bootstrap.sh; cd /srv/salt/scripts && source_local_envs && configure_salt_master && configure_salt_minion && install_salt_formula_pkg'")
- sh("(pgrep salt-master | sed /\$\$/d | xargs --no-run-if-empty -I {} kill -9 {} || true) && pkill -9 salt-minion || true")
- sh("service salt-master restart && service salt-minion restart && sleep 15")
+ sh("bash -c 'source /srv/salt/scripts/bootstrap.sh; cd /srv/salt/scripts && saltservice_restart'")
}
def jobFinished = false