update wait-for-job-finish.sh

Author: aweng98

.circleci/wait-for-job-finish.sh

@@ -1,35 +1,34 @@
 #!/usr/bin/env bash
 
-# Exit script when any executed command return non-zero code.
-set -e
-
 # Exit script if you try to use an uninitialized variable.
 set -o nounset
 
 # Use the error status of the first failure, rather than that of the last item in a pipeline.
 set -o pipefail
 
-trap 's=$?; echo >&2 "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR
-
+trap 's=$?; echo -e >&2 "\nError in $0:\nat line "$LINENO": $BASH_COMMAND"; exit $s' ERR
 
+date
 counter=0
 
 # Wait up to 25 minutes for job to finish. A job can run on multiple nodes: parallelism > 1
 while [ "$counter" -le 1500 ]; do
-  # Find number of nodes in running
-  job_detail=$(curl -s "https://circleci.com/api/v2/project/github/DataBiosphere/terra-ui/job/$CIRCLE_BUILD_NUM")
-  job_running_nodes_count=$(echo "$job_detail" | jq -r '.parallel_runs[] | select(.status == "running") | select(.index != '"$CIRCLE_NODE_INDEX"')' | grep -c "running")
-
-  if [ "$job_running_nodes_count" -eq 0 ]; then
-    exit 0
+  # Find number of nodes in running or queued
+  build_detail=$(curl -s "https://circleci.com/api/v2/project/github/DataBiosphere/terra-ui/job/$CIRCLE_BUILD_NUM")
+
+  running_vm=$(echo "$build_detail" | jq -r --arg INDX "$CIRCLE_NODE_INDEX" '.parallel_runs[] | select(.status=="running") | select(.index|tostring!=$INDX)')
+  count=$(echo "$running_vm" | grep -c -e "running" || test $? = 1;)
+  if [ "$count" -eq 0 ]; then
+      echo "Parallel runs have finished. Exiting wait-for-job-finish script."
+      exit 0
   fi
 
+  echo "Waiting for parallel runs to finish..."
   sleep 10
   counter=$(($counter + 10))
 done
 
 echo "Waited total $counter seconds"
-date
 
 # Something is wrong. Log response for error troubleshooting
 curl -s "https://circleci.com/api/v2/project/github/DataBiosphere/terra-ui/job/$CIRCLE_BUILD_NUM" | jq -r '.'