Changeset 139552 in webkit


Ignore:
Timestamp:
Jan 12, 2013 12:16:16 PM (11 years ago)
Author:
commit-queue@webkit.org
Message:

Migrate the remaining bots in EC2 to Google Compute Engine
​https://bugs.webkit.org/show_bug.cgi?id=106005

Patch by Alan Cutter <​alancutter@chromium.org> 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:
Location:
trunk/Tools
Files:
4 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r139549 r139552  
     12013-01-12  Alan Cutter  <alancutter@chromium.org>
     2
     3        Migrate the remaining bots in EC2 to Google Compute Engine
     4        https://bugs.webkit.org/show_bug.cgi?id=106005
     5
     6        Reviewed by Eric Seidel.
     7
     8        Updated bot scripts for launching feeder-queue, style-queue and sheriffbot on GCE.
     9
     10        * EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh: Copied from Tools/EWSTools/build-repo.sh.
     11        * EWSTools/boot.sh:
     12        * EWSTools/build-repo.sh:
     13        * EWSTools/start-queue.sh:
     14
    1152013-01-12  Jochen Eisinger  <jochen@chromium.org>
    216

  • trunk/Tools/EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh

    r139551 r139552  
    2828# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2929
    30 if [[ $# -lt 3 ]] || [[ $# -gt 4 ]]; then
    31     echo "Usage: start-queue-loop.sh QUEUE_NAME BOT_ID RESET_AFTER_ITERATION [QUEUE_PARAMS]"
    32     exit 1
     30if [[ $# -ne 1 ]];then
     31echo "Usage: build-feeder-style-sheriffbot.sh BOT_NUMBER"
     32exit 1
    3333fi
    3434
    35 QUEUE_NAME=$1
    36 BOT_ID=$2
    37 RESET_AFTER_ITERATION=$3
    38 QUEUE_PARAMS=$4
     35BOT_ID=gce-feeder-$1
     36BUGZILLA_USERNAME=webkit.review.bot@gmail.com
     37read -s -p "Bugzilla Password: " BUGZILLA_PASSWORD && echo
     38read -s -p "sheriffbot IRC Password: " IRC_PASSWORD && echo
    3939
    40 cd /mnt/git/webkit-$QUEUE_NAME
    41 while :
    42 do
    43     # This somewhat quirky sequence of steps seems to clear up all the broken
    44     # git situations we've gotten ourself into in the past.
    45     git clean -f # Remove any left-over layout test results, added files, etc.
    46     git rebase --abort # If we got killed during a git rebase, we need to clean up.
    47     git fetch origin # Avoid updating the working copy to a stale revision.
    48     git checkout origin/master -f
    49     git branch -D master
    50     git checkout origin/master -b master
     40PROJECT=google.com:webkit
     41# FIXME: We should use gcutil to find a zone that's actually up.
     42ZONE=us-east1-a
     43IMAGE=projects/google/images/ubuntu-10-04-v20120621
     44MACHINE_TYPE=n1-standard-4-d
    5145
    52     # Most queues auto-update as part of their normal operation, but updating
    53     # here makes sure that we get the latest version of the master process.
    54     ./Tools/Scripts/update-webkit
     46gcutil --project=$PROJECT addinstance $BOT_ID --machine_type=$MACHINE_TYPE --image=$IMAGE --zone=$ZONE --wait_until_running
    5547
    56     # test-webkitpy has code to remove orphaned .pyc files, so we
    57     # run it before running webkit-patch to avoid stale .pyc files
    58     # preventing webkit-patch from launching.
    59     ./Tools/Scripts/test-webkitpy
     48echo "Sleeping for 30s to let the server spin up ssh..."
     49sleep 30
    6050
    61     # We use --exit-after-iteration to pick up any changes to webkit-patch, including
    62     # changes to the committers.py file.
    63     ./Tools/Scripts/webkit-patch $QUEUE_NAME --bot-id=$BOT_ID --no-confirm --exit-after-iteration $RESET_AFTER_ITERATION $QUEUE_PARAMS
    64 done
     51gcutil --project=$PROJECT ssh $BOT_ID "
     52    sudo apt-get install subversion -y &&
     53    svn checkout http://svn.webkit.org/repository/webkit/trunk/Tools/EWSTools tools &&
     54    cd tools &&
     55    bash build-vm.sh &&
     56    bash build-repo.sh feeder-queue $BUGZILLA_USERNAME $BUGZILLA_PASSWORD &&
     57    cp -r /mnt/git/webkit-feeder-queue /mnt/git/webkit-style-queue &&
     58    cp -r /mnt/git/webkit-feeder-queue /mnt/git/webkit-sheriff-bot &&
     59    bash build-boot-cmd.sh \"\\
     60screen -t fq ./start-queue.sh feeder-queue $BOT_ID 10
     61screen -t sq ./start-queue.sh style-queue $BOT_ID 10
     62screen -t sb ./start-queue.sh sheriff-bot $BOT_ID 180 --irc-password=$IRC_PASSWORD\"
     63    bash boot.sh
     64"

  • trunk/Tools/EWSTools/boot.sh

    r121641 r139552  
    2828# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2929
    30 screen -d -m -c ~/tools/screen-config
     30CWD=$(pwd)
     31
     32cd ~/tools
     33screen -d -m -c ./screen-config
     34
     35cd $CWD

  • trunk/Tools/EWSTools/build-repo.sh

    r139354 r139552  
    2828# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2929
    30 if [[ $# -ne 4 ]];then
     30if [[ $# -ne 3 ]];then
    3131echo "Usage: build-repo.sh QUEUE_TYPE BUGZILLA_USERNAME BUGZILLA_PASSWORD"
    3232exit 1
    … …  
    3939echo "Cloning WebKit git repository, process takes ~30m."
    4040echo "Note: No status output will be shown via remote pipe."
    41 git clone http://git.webkit.org/WebKit.git webkit-$1
     41git clone git://git.webkit.org/WebKit.git webkit-$1
    4242cd webkit-$1
    4343

  • trunk/Tools/EWSTools/start-queue.sh

    r139420 r139552  
    2828# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2929
    30 if [[ $# -lt 3 ]] || [[ $# -gt 4 ]]; then
     30# The GCE VM image we're using only has bash v4.1.5
     31if test $# -lt 3 -o $# -gt 4; then
    3132    echo "Usage: start-queue-loop.sh QUEUE_NAME BOT_ID RESET_AFTER_ITERATION [QUEUE_PARAMS]"
    3233    exit 1
Note: See TracChangeset for help on using the changeset viewer.