merge other changes

Author: wajihyassine

turbinia/e2e/run-e2e-gke.sh

@@ -78,16 +78,24 @@ turbinia-client config list
 echo "Running Turbinia: turbinia-client submit googleclouddisk --project $GCP_PROJECT --zone $GCP_ZONE --disk_name $DISK --request_id $REQUEST_ID"
 turbinia-client submit googleclouddisk --project $GCP_PROJECT --zone $GCP_ZONE --disk_name $DISK --request_id $REQUEST_ID
 
-# Wait until request is complete
-sleep 5
+# Wait until request is received
+req=$(turbinia-client status request $REQUEST_ID -j)
+while [[ -z "$req" ]]
+do
+  echo "Request $REQUEST_ID is still populating. Sleeping for 5 seconds..."
+  sleep 5
+  req=$(turbinia-client status request $REQUEST_ID -j)
+done
+
+# Wait until request is complete 
 req_status=$(turbinia-client status request $REQUEST_ID -j | jq -r '.status')
-while [ $req_status = "running" ]
+while [[ $req_status = "running" ]]
 do
   req_status=$(turbinia-client status request $REQUEST_ID -j | jq -r '.status')
   if [[ $req_status = "running" ]]
   then
-    echo "Turbinia request $REQUEST_ID is still running. Sleeping for 10 seconds..."
-    sleep 10
+    echo "Turbinia request $REQUEST_ID is still running. Sleeping for 180 seconds..."
+    sleep 180
   fi
 done
 
@@ -100,7 +108,7 @@ length=$(echo $task_status | jq '. | length')
 # Check if there is a failed Turbinia Task
 if [[ $length > 0 ]]
 then
-  echo "A failed Task for Turbinia Request $req has been detected."
+  echo "A failed Task for Turbinia Request $REQUEST_ID has been detected"
   echo "Listing failed Tasks..."
   # Grab the Task ID
   tasks=$(echo $task_status | jq -r '.[] | .id')
@@ -124,7 +132,7 @@ then
   done
 # If no failed Tasks were detected
 else
-  echo "No failed Tasks detected for Turbinia request $req"
+  echo "No failed Tasks detected for Turbinia request $REQUEST_ID"
 fi
 
 # Restore previous Turbinia config
@@ -145,4 +153,4 @@ echo "Turbinia integration tests succeeded!"
 echo -n "Ended at "
 date -Iseconds
 
-exit 0
+exit 0