Title: [139957] trunk/Tools
- Revision
- 139957
- Author
- commit-qu...@webkit.org
- Date
- 2013-01-16 20:00:01 -0800 (Wed, 16 Jan 2013)
Log Message
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 <alancut...@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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (139956 => 139957)
--- trunk/Tools/ChangeLog 2013-01-17 03:59:37 UTC (rev 139956)
+++ trunk/Tools/ChangeLog 2013-01-17 04:00:01 UTC (rev 139957)
@@ -1,5 +1,16 @@
2013-01-16 Alan Cutter <alancut...@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 <alancut...@chromium.org>
+
start-queue.sh does not pass remaining parameters correctly
https://bugs.webkit.org/show_bug.cgi?id=107054
Modified: trunk/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh (139956 => 139957)
--- trunk/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh 2013-01-17 03:59:37 UTC (rev 139956)
+++ trunk/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh 2013-01-17 04:00:01 UTC (rev 139957)
@@ -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 @@
exit 1
fi
+CWD="$(pwd)"
+cd "$(dirname "$0")"
+
QUEUE_TYPE=chromium-ews
BOT_ID=gce-cr-linux-$1
BUGZILLA_USERNAME=webkit.review....@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 @@
bash build-boot-cmd.sh \"screen -t kr ./start-queue.sh $QUEUE_TYPE $BOT_ID 10\" &&
bash boot.sh
"
+
+cd "$CWD"
Modified: trunk/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh (139956 => 139957)
--- trunk/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh 2013-01-17 03:59:37 UTC (rev 139956)
+++ trunk/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh 2013-01-17 04:00:01 UTC (rev 139957)
@@ -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 @@
exit 1
fi
+CWD="$(pwd)"
+cd "$(dirname "$0")"
+
QUEUE_TYPE=commit-queue
BOT_ID=gce-cq-$1
BUGZILLA_USERNAME=webkit.review....@gmail.com
read -s -p "Bugzilla Password: " BUGZILLA_PASSWORD && echo
-
SVN_USERNAME=commit-qu...@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 @@
bash build-boot-cmd.sh \"screen -t kr ./start-queue.sh $QUEUE_TYPE $BOT_ID 10\" &&
bash boot.sh
"
+
+cd "$CWD"
Modified: trunk/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh (139956 => 139957)
--- trunk/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh 2013-01-17 03:59:37 UTC (rev 139956)
+++ trunk/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh 2013-01-17 04:00:01 UTC (rev 139957)
@@ -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 @@
exit 1
fi
+CWD="$(pwd)"
+cd "$(dirname "$0")"
+
BOT_ID=gce-feeder-$1
BUGZILLA_USERNAME=webkit.review....@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 sb ./start-queue.sh sheriff-bot $BOT_ID 180 --irc-password=$IRC_PASSWORD\"
bash boot.sh
"
+
+cd "$CWD"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
