Title: [139704] trunk/Tools
- Revision
- 139704
- Author
- [email protected]
- Date
- 2013-01-14 19:00:55 -0800 (Mon, 14 Jan 2013)
Log Message
Fix EWS GCE build scripts to detect which zone is available
https://bugs.webkit.org/show_bug.cgi?id=106524
Patch by Alan Cutter <[email protected]> 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.
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (139703 => 139704)
--- trunk/Tools/ChangeLog 2013-01-15 02:49:41 UTC (rev 139703)
+++ trunk/Tools/ChangeLog 2013-01-15 03:00:55 UTC (rev 139704)
@@ -1,3 +1,15 @@
+2013-01-14 Alan Cutter <[email protected]>
+
+ 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 <[email protected]>
Adding an error string to AmbiguousCommitError.
Modified: trunk/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh (139703 => 139704)
--- trunk/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh 2013-01-15 02:49:41 UTC (rev 139703)
+++ trunk/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh 2013-01-15 03:00:55 UTC (rev 139704)
@@ -38,8 +38,7 @@
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
Modified: trunk/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh (139703 => 139704)
--- trunk/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh 2013-01-15 02:49:41 UTC (rev 139703)
+++ trunk/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh 2013-01-15 03:00:55 UTC (rev 139704)
@@ -41,8 +41,7 @@
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
Modified: trunk/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh (139703 => 139704)
--- trunk/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh 2013-01-15 02:49:41 UTC (rev 139703)
+++ trunk/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh 2013-01-15 03:00:55 UTC (rev 139704)
@@ -38,8 +38,7 @@
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
Added: trunk/Tools/EWSTools/GoogleComputeEngine/findzone.sh (0 => 139704)
--- trunk/Tools/EWSTools/GoogleComputeEngine/findzone.sh (rev 0)
+++ trunk/Tools/EWSTools/GoogleComputeEngine/findzone.sh 2013-01-15 03:00:55 UTC (rev 139704)
@@ -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)
Property changes on: trunk/Tools/EWSTools/GoogleComputeEngine/findzone.sh
___________________________________________________________________
Added: svn:executable
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
