Wait for a while after salt-minion restart
Change-Id: I27f58a572c42b2271dcd4b2e8b480a6e96e7633e
diff --git a/cicd-lab-pipeline.groovy b/cicd-lab-pipeline.groovy
index ce8a0f3..6ab1e3a 100644
--- a/cicd-lab-pipeline.groovy
+++ b/cicd-lab-pipeline.groovy
@@ -166,9 +166,9 @@
try {
salt.enforceState(saltMaster, 'I@gerrit:client', 'gerrit', true)
} catch (Exception e) {
- timeout(1) {
- salt.cmdRun(saltMaster, 'I@gerrit:client', "exec 0>&-; exec 1>&-; exec 2>&-; nohup /bin/sh -c 'salt-call --local service.restart salt-minion' &")
- }
+ print "Restarting Salt minion"
+ salt.cmdRun(saltMaster, 'I@gerrit:client', "exec 0>&-; exec 1>&-; exec 2>&-; nohup /bin/sh -c 'salt-call --local service.restart salt-minion' &")
+ sleep(30)
throw e
}
}
@@ -183,9 +183,9 @@
try {
salt.enforceState(saltMaster, 'I@jenkins:client', 'jenkins', true)
} catch (Exception e) {
- timeout(1) {
- salt.cmdRun(saltMaster, 'I@jenkins:client', "exec 0>&-; exec 1>&-; exec 2>&-; nohup /bin/sh -c 'salt-call --local service.restart salt-minion' &")
- }
+ print "Restarting Salt minion"
+ salt.cmdRun(saltMaster, 'I@jenkins:client', "exec 0>&-; exec 1>&-; exec 2>&-; nohup /bin/sh -c 'salt-call --local service.restart salt-minion' &")
+ sleep(30)
throw e
}
}