Fix sleep in waiting for services
Change-Id: I6d4761890787d7a498de90485d9469571a2e1caa
diff --git a/cicd-lab-pipeline.groovy b/cicd-lab-pipeline.groovy
index 3fbda13..f0cc9e8 100644
--- a/cicd-lab-pipeline.groovy
+++ b/cicd-lab-pipeline.groovy
@@ -100,7 +100,7 @@
stage("Deploy GlusterFS") {
salt.enforceState(saltMaster, 'I@glusterfs:server', 'glusterfs.server.service', true)
salt.enforceState(saltMaster, 'ci01*', 'glusterfs.server.setup', true)
- sleep(5000)
+ sleep(5)
salt.enforceState(saltMaster, 'I@glusterfs:client', 'glusterfs.client', true)
print salt.cmdRun(saltMaster, 'I@glusterfs:client', 'mount|grep fuse.glusterfs || echo "Command failed"')
}
@@ -124,7 +124,7 @@
// XXX: Hack to fix dependency of gerrit on mysql
print salt.cmdRun(saltMaster, 'I@docker:swarm:role:master', "docker service rm gerrit; sleep 5; rm -rf /srv/volumes/gerrit/*")
- sleep(10000)
+ sleep(10)
print salt.cmdRun(saltMaster, 'I@docker:swarm:role:master', "apt-get install -y mysql-client; mysql -ppassword -h172.16.10.254 -e'drop database gerrit;create database gerrit;'")
salt.enforceState(saltMaster, 'I@docker:swarm:role:master', 'docker.client')
// ---- cut here (end of hack) ----
@@ -134,14 +134,13 @@
for (entry in out['return']) {
for (node in entry) {
if (node.value =~ /Some services are not running/) {
+ sleep(10)
throw new Exception("$node.key: $node.value")
-
} else {
print out
}
}
}
- sleep(10000)
}
}