Fix EWS GCE build scripts to detect which zone is available

https://bugs.webkit.org/show_bug.cgi?id=106524

Patch by Alan Cutter <alancutter@chromium.org> on 2013-01-14
Reviewed by Adam Barth.

* EWSTools/GoogleComputeEngine/build-chromium-ews.sh:
* EWSTools/GoogleComputeEngine/build-commit-queue.sh:
* EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh:
* EWSTools/GoogleComputeEngine/findzone.sh: Added.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@139704 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index ffc07eab71426c862c2360a4ae01e55405c5a280..a207f0c8e3e716334d7514bf26dfe48715df7884 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2013-01-14  Alan Cutter  <alancutter@chromium.org>
+
+        Fix EWS GCE build scripts to detect which zone is available
+        https://bugs.webkit.org/show_bug.cgi?id=106524
+
+        Reviewed by Adam Barth.
+
+        * EWSTools/GoogleComputeEngine/build-chromium-ews.sh:
+        * EWSTools/GoogleComputeEngine/build-commit-queue.sh:
+        * EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh:
+        * EWSTools/GoogleComputeEngine/findzone.sh: Added.
+
 2013-01-14  Tim 'mithro' Ansell  <mithro@mithis.com>
 
         Adding an error string to AmbiguousCommitError.

diff --git a/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh b/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh
index 45a183653346c8a9eb50c00c3624d6f584b06d39..4c10a78693f802986c25c45dfe3c62b8898e3043 100755 (executable)
--- a/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh
+++ b/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh
@@ -38,8 +38,7 @@ BUGZILLA_USERNAME=webkit.review.bot@gmail.com
 read -s -p "Bugzilla Password: " BUGZILLA_PASSWORD && echo
 
 PROJECT=google.com:webkit
-# FIXME: We should use gcutil to find a zone that's actually up.
-ZONE=us-east1-a
+ZONE=$(findzone.sh $PROJECT)
 IMAGE=projects/google/images/ubuntu-10-04-v20120621
 MACHINE_TYPE=n1-standard-4-d
 

diff --git a/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh b/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh
index 5325ca7881a075e419b920bb27fbf6abbf271e48..af38c5c3e9363d20083c3284e673048e52abb8e4 100755 (executable)
--- a/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh
+++ b/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh
@@ -41,8 +41,7 @@ SVN_USERNAME=commit-queue@webkit.org
 read -s -p "Subversion Password: " SVN_PASSWORD && echo
 
 PROJECT=google.com:webkit
-# FIXME: We should use gcutil to find a zone that's actually up.
-ZONE=us-east1-a
+ZONE=$(findzone.sh $PROJECT)
 IMAGE=projects/google/images/ubuntu-10-04-v20120621
 MACHINE_TYPE=n1-standard-4-d
 

diff --git a/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh b/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh
index 51ceecde9142b1b1e98fd2b863481b0b14faaa68..782a0bca4428c0640580e7786cf6a5920bb9474f 100755 (executable)
--- a/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh
+++ b/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh
@@ -38,8 +38,7 @@ read -s -p "Bugzilla Password: " BUGZILLA_PASSWORD && echo
 read -s -p "sheriffbot IRC Password: " IRC_PASSWORD && echo
 
 PROJECT=google.com:webkit
-# FIXME: We should use gcutil to find a zone that's actually up.
-ZONE=us-east1-a
+ZONE=$(findzone.sh $PROJECT)
 IMAGE=projects/google/images/ubuntu-10-04-v20120621
 MACHINE_TYPE=n1-standard-4-d
 

diff --git a/Tools/EWSTools/GoogleComputeEngine/findzone.sh b/Tools/EWSTools/GoogleComputeEngine/findzone.sh
new file mode 100755 (executable)
index 0000000..ac2cee5
--- /dev/null
+++ b/Tools/EWSTools/GoogleComputeEngine/findzone.sh
@@ -0,0 +1,5 @@
+if [[ $# -ne 1 ]]; then
+    echo "Usage: findzone.sh PROJECT"
+fi
+
+echo $(gcutil --project=$1 listzones | grep UP | awk '{print $2}' | sort | tail -1)