Fix gce.sh destory timeouts.

This commit is contained in:
Tom Wilkie committed 2015-06-24 17:13:37 +00:00
1 parent 76a12edf57
commit 7780ac1078
1 file changed
+11 -5
+11 -5
View File
@@ -36,11 +36,17 @@ function destroy {
names="$(vm_names)"
for i in {0..10}; do
# gcloud instances delete can sometimes hang.
timeout 60s /bin/bash -c "gcloud compute instances delete --zone $ZONE -q $names || true"
# 124 means it timed out
if [ $? -ne 124 ]; then
return
fi
case $(set +e; timeout 60s /bin/bash -c "gcloud compute instances delete --zone $ZONE -q $names >/dev/null 2>&1 || true"; echo $?) in
0)
return 0
;;
124)
# 124 means it timed out
break
;;
*)
return 1
esac
done
}