GCE build scripts don't take working directory into account when calling findzone.sh

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

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

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

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 3943f5b..c58525f 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,16 @@
 2013-01-16  Alan Cutter  <alancutter@chromium.org>
 
+        GCE build scripts don't take working directory into account when calling findzone.sh
+        https://bugs.webkit.org/show_bug.cgi?id=106962
+
+        Reviewed by Adam Barth.
+
+        * EWSTools/GoogleComputeEngine/build-chromium-ews.sh:
+        * EWSTools/GoogleComputeEngine/build-commit-queue.sh:
+        * EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh:
+
+2013-01-16  Alan Cutter  <alancutter@chromium.org>
+
         start-queue.sh does not pass remaining parameters correctly
         https://bugs.webkit.org/show_bug.cgi?id=107054
 

diff --git a/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh b/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh
index 4c10a78..badb6e7 100755 (executable)
--- a/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh
+++ b/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012 Google Inc. All rights reserved.
+# Copyright (c) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -32,13 +32,16 @@ echo "Usage: build-cr-linux-ews.sh BOT_NUMBER"
 exit 1
 fi
 
+CWD="$(pwd)"
+cd "$(dirname "$0")"
+
 QUEUE_TYPE=chromium-ews
 BOT_ID=gce-cr-linux-$1
 BUGZILLA_USERNAME=webkit.review.bot@gmail.com
 read -s -p "Bugzilla Password: " BUGZILLA_PASSWORD && echo
 
 PROJECT=google.com:webkit
-ZONE=$(findzone.sh $PROJECT)
+ZONE=$(bash findzone.sh $PROJECT)
 IMAGE=projects/google/images/ubuntu-10-04-v20120621
 MACHINE_TYPE=n1-standard-4-d
 
@@ -56,3 +59,5 @@ gcutil --project=$PROJECT ssh $BOT_ID "
     bash build-boot-cmd.sh \"screen -t kr ./start-queue.sh $QUEUE_TYPE $BOT_ID 10\" &&
     bash boot.sh
 "
+
+cd "$CWD"

diff --git a/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh b/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh
index af38c5c..b5130b6 100755 (executable)
--- a/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh
+++ b/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012 Google Inc. All rights reserved.
+# Copyright (c) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -32,16 +32,18 @@ echo "Usage: build-commit-queue.sh BOT_NUMBER"
 exit 1
 fi
 
+CWD="$(pwd)"
+cd "$(dirname "$0")"
+
 QUEUE_TYPE=commit-queue
 BOT_ID=gce-cq-$1
 BUGZILLA_USERNAME=webkit.review.bot@gmail.com
 read -s -p "Bugzilla Password: " BUGZILLA_PASSWORD && echo
-
 SVN_USERNAME=commit-queue@webkit.org
 read -s -p "Subversion Password: " SVN_PASSWORD && echo
 
 PROJECT=google.com:webkit
-ZONE=$(findzone.sh $PROJECT)
+ZONE=$(bash findzone.sh $PROJECT)
 IMAGE=projects/google/images/ubuntu-10-04-v20120621
 MACHINE_TYPE=n1-standard-4-d
 
@@ -60,3 +62,5 @@ gcutil --project=$PROJECT ssh $BOT_ID "
     bash build-boot-cmd.sh \"screen -t kr ./start-queue.sh $QUEUE_TYPE $BOT_ID 10\" &&
     bash boot.sh
 "
+
+cd "$CWD"

diff --git a/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh b/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh
index 782a0bc..f9722cb 100755 (executable)
--- a/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh
+++ b/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012 Google Inc. All rights reserved.
+# Copyright (c) 2013 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -32,13 +32,16 @@ echo "Usage: build-feeder-style-sheriffbot.sh BOT_NUMBER"
 exit 1
 fi
 
+CWD="$(pwd)"
+cd "$(dirname "$0")"
+
 BOT_ID=gce-feeder-$1
 BUGZILLA_USERNAME=webkit.review.bot@gmail.com
 read -s -p "Bugzilla Password: " BUGZILLA_PASSWORD && echo
 read -s -p "sheriffbot IRC Password: " IRC_PASSWORD && echo
 
 PROJECT=google.com:webkit
-ZONE=$(findzone.sh $PROJECT)
+ZONE=$(bash findzone.sh $PROJECT)
 IMAGE=projects/google/images/ubuntu-10-04-v20120621
 MACHINE_TYPE=n1-standard-4-d
 
@@ -61,3 +64,5 @@ screen -t sq ./start-queue.sh style-queue $BOT_ID 10
 screen -t sb ./start-queue.sh sheriff-bot $BOT_ID 180 --irc-password=$IRC_PASSWORD\"
     bash boot.sh
 "
+
+cd "$CWD"