update

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

@@ -13,13 +13,16 @@ 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 or queued
-  build_detail=$(curl -s "https://circleci.com/api/v2/project/github/DataBiosphere/terra-ui/job/$CIRCLE_BUILD_NUM")
+  # Find number of nodes in running
+  job_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)')
+  # First, check the response for valid job json
+  runs=$(echo "$job_detail" | jq -r '.parallel_runs[]')
+  running_vm=$(echo "$runs" | jq -r 'select(.status=="running")')
   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."
+      echo "$runs"
       exit 0
   fi