Title: [139552] trunk/Tools
- Revision
- 139552
- Author
- [email protected]
- Date
- 2013-01-12 12:16:16 -0800 (Sat, 12 Jan 2013)
Log Message
Migrate the remaining bots in EC2 to Google Compute Engine
https://bugs.webkit.org/show_bug.cgi?id=106005
Patch by Alan Cutter <[email protected]> on 2013-01-12
Reviewed by Eric Seidel.
Updated bot scripts for launching feeder-queue, style-queue and sheriffbot on GCE.
* EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh: Copied from Tools/EWSTools/build-repo.sh.
* EWSTools/boot.sh:
* EWSTools/build-repo.sh:
* EWSTools/start-queue.sh:
Modified Paths
Added Paths
Diff
Modified: trunk/Tools/ChangeLog (139551 => 139552)
--- trunk/Tools/ChangeLog 2013-01-12 18:05:19 UTC (rev 139551)
+++ trunk/Tools/ChangeLog 2013-01-12 20:16:16 UTC (rev 139552)
@@ -1,3 +1,17 @@
+2013-01-12 Alan Cutter <[email protected]>
+
+ Migrate the remaining bots in EC2 to Google Compute Engine
+ https://bugs.webkit.org/show_bug.cgi?id=106005
+
+ Reviewed by Eric Seidel.
+
+ Updated bot scripts for launching feeder-queue, style-queue and sheriffbot on GCE.
+
+ * EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh: Copied from Tools/EWSTools/build-repo.sh.
+ * EWSTools/boot.sh:
+ * EWSTools/build-repo.sh:
+ * EWSTools/start-queue.sh:
+
2013-01-12 Jochen Eisinger <[email protected]>
[chromium] move inspector related methods to TestRunner library
Copied: trunk/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh (from rev 139551, trunk/Tools/EWSTools/start-queue.sh) (0 => 139552)
--- trunk/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh (rev 0)
+++ trunk/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh 2013-01-12 20:16:16 UTC (rev 139552)
@@ -0,0 +1,64 @@
+#!/bin/sh
+# Copyright (c) 2012 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
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+if [[ $# -ne 1 ]];then
+echo "Usage: build-feeder-style-sheriffbot.sh BOT_NUMBER"
+exit 1
+fi
+
+BOT_ID=gce-feeder-$1
[email protected]
+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
+IMAGE=projects/google/images/ubuntu-10-04-v20120621
+MACHINE_TYPE=n1-standard-4-d
+
+gcutil --project=$PROJECT addinstance $BOT_ID --machine_type=$MACHINE_TYPE --image=$IMAGE --zone=$ZONE --wait_until_running
+
+echo "Sleeping for 30s to let the server spin up ssh..."
+sleep 30
+
+gcutil --project=$PROJECT ssh $BOT_ID "
+ sudo apt-get install subversion -y &&
+ svn checkout http://svn.webkit.org/repository/webkit/trunk/Tools/EWSTools tools &&
+ cd tools &&
+ bash build-vm.sh &&
+ bash build-repo.sh feeder-queue $BUGZILLA_USERNAME $BUGZILLA_PASSWORD &&
+ cp -r /mnt/git/webkit-feeder-queue /mnt/git/webkit-style-queue &&
+ cp -r /mnt/git/webkit-feeder-queue /mnt/git/webkit-sheriff-bot &&
+ bash build-boot-cmd.sh \"\\
+screen -t fq ./start-queue.sh feeder-queue $BOT_ID 10
+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
+"
Modified: trunk/Tools/EWSTools/boot.sh (139551 => 139552)
--- trunk/Tools/EWSTools/boot.sh 2013-01-12 18:05:19 UTC (rev 139551)
+++ trunk/Tools/EWSTools/boot.sh 2013-01-12 20:16:16 UTC (rev 139552)
@@ -27,4 +27,9 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-screen -d -m -c ~/tools/screen-config
+CWD=$(pwd)
+
+cd ~/tools
+screen -d -m -c ./screen-config
+
+cd $CWD
Modified: trunk/Tools/EWSTools/build-repo.sh (139551 => 139552)
--- trunk/Tools/EWSTools/build-repo.sh 2013-01-12 18:05:19 UTC (rev 139551)
+++ trunk/Tools/EWSTools/build-repo.sh 2013-01-12 20:16:16 UTC (rev 139552)
@@ -27,7 +27,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-if [[ $# -ne 4 ]];then
+if [[ $# -ne 3 ]];then
echo "Usage: build-repo.sh QUEUE_TYPE BUGZILLA_USERNAME BUGZILLA_PASSWORD"
exit 1
fi
@@ -38,7 +38,7 @@
echo "Cloning WebKit git repository, process takes ~30m."
echo "Note: No status output will be shown via remote pipe."
-git clone http://git.webkit.org/WebKit.git webkit-$1
+git clone git://git.webkit.org/WebKit.git webkit-$1
cd webkit-$1
cat >> .git/config <<EOF
Modified: trunk/Tools/EWSTools/start-queue.sh (139551 => 139552)
--- trunk/Tools/EWSTools/start-queue.sh 2013-01-12 18:05:19 UTC (rev 139551)
+++ trunk/Tools/EWSTools/start-queue.sh 2013-01-12 20:16:16 UTC (rev 139552)
@@ -27,7 +27,8 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-if [[ $# -lt 3 ]] || [[ $# -gt 4 ]]; then
+# The GCE VM image we're using only has bash v4.1.5
+if test $# -lt 3 -o $# -gt 4; then
echo "Usage: start-queue-loop.sh QUEUE_NAME BOT_ID RESET_AFTER_ITERATION [QUEUE_PARAMS]"
exit 1
fi
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
