Glusterfs SIGTERM workaround is no longer needed
Change-Id: I0674db8a22db2628f372092c7f76a35bac7618c6
diff --git a/cicd-lab-pipeline.groovy b/cicd-lab-pipeline.groovy
index 2ce94a4..cbcbd58 100644
--- a/cicd-lab-pipeline.groovy
+++ b/cicd-lab-pipeline.groovy
@@ -169,10 +169,6 @@
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(5)
- // XXX: Restart of salt-minion will cause glusterfs to
- // receive SIGTERM and got unmounted which will break
- // everything
- salt.enforceState(saltMaster, 'I@glusterfs:client', 'glusterfs.client', true)
throw e
}
}
@@ -190,10 +186,6 @@
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(5)
- // XXX: Restart of salt-minion will cause glusterfs to
- // receive SIGTERM and got unmounted which will break
- // everything
- salt.enforceState(saltMaster, 'I@glusterfs:client', 'glusterfs.client', true)
throw e
}
}