Simplifying and correcting pipeline scripts

21guns · Feb 18, 2016 · 2fa9404 · 2fa9404
1 parent 792f3ef
commit 2fa9404
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/base/execute-step.sh b/base/execute-step.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
 echo "Execute step ${INIT_DAEMON_STEP} in pipeline"
-until [ $(curl -s -X PUT $INIT_DAEMON_BASE_URI/execute?step=$INIT_DAEMON_STEP) = "true" ]; do
-    echo -n '.'
-    sleep 5
-done
+curl -X PUT $INIT_DAEMON_BASE_URI/execute?step=$INIT_DAEMON_STEP
+
diff --git a/base/finish-step.sh b/base/finish-step.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
 echo "Finish step ${INIT_DAEMON_STEP} in pipeline"
-until [ $(curl -s -X PUT $INIT_DAEMON_BASE_URI/finish?step=$INIT_DAEMON_STEP) = "true" ]; do
-    echo -n '.'
-    sleep 5
-done
+curl -s -X PUT $INIT_DAEMON_BASE_URI/finish?step=$INIT_DAEMON_STEP
diff --git a/base/wait-for-step.sh b/base/wait-for-step.sh
@@ -1,7 +1,10 @@
 #!/bin/bash
 
 echo "Validating if step ${INIT_DAEMON_STEP} can start in pipeline"
-until [ $(curl -s $INIT_DAEMON_BASE_URI/canStart?step=$INIT_DAEMON_STEP) = "true" ]; do
-    echo -n '.'
+while true; do
     sleep 5
+    echo -n '.'
+    string=$(curl -s $INIT_DAEMON_BASE_URI/canStart?step=$INIT_DAEMON_STEP)
+    [ "$string" = "true" ] && break
 done
+echo "Can start step ${INIT_DAEMON_STEP}"