Changeset 143360 in webkit


Ignore:
Timestamp:
Feb 19, 2013 11:10:27 AM (11 years ago)
Author:
commit-queue@webkit.org
Message:

REGRESSION: Sheriffbot is failing to process rollout requests
​https://bugs.webkit.org/show_bug.cgi?id=106945

Patch by Alan Cutter <​alancutter@chromium.org> on 2013-02-19
Reviewed by Adam Barth.

Modified Sheriffbot build script to track the svn repo from git and add bot user details to the git repo config file.
This resolves problems when Sheriffbot attempts to perform a rollout request.

  • EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh:
  • EWSTools/configure-git-svn.sh: Copied from Tools/EWSTools/create-webkit-git.
  • EWSTools/configure-git-user.sh: Renamed from Tools/EWSTools/create-webkit-git.
Location:
trunk/Tools
Files:
2 edited
1 copied
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r143345 r143360  
     12013-02-19  Alan Cutter  <alancutter@chromium.org>
     2
     3        REGRESSION: Sheriffbot is failing to process rollout requests
     4        https://bugs.webkit.org/show_bug.cgi?id=106945
     5
     6        Reviewed by Adam Barth.
     7
     8        Modified Sheriffbot build script to track the svn repo from git and add bot user details to the git repo config file.
     9        This resolves problems when Sheriffbot attempts to perform a rollout request.
     10
     11        * EWSTools/GoogleComputeEngine/build-feeder-style-sheriffbot.sh:
     12        * EWSTools/configure-git-svn.sh: Copied from Tools/EWSTools/create-webkit-git.
     13        * EWSTools/configure-git-user.sh: Renamed from Tools/EWSTools/create-webkit-git.
     14
    1152013-02-19  Claudio Saavedra  <csaavedra@igalia.com>
    216

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

    r143156 r143360  
    5656    cp -r /mnt/git/webkit-feeder-queue /mnt/git/webkit-style-queue &&
    5757    cp -r /mnt/git/webkit-feeder-queue /mnt/git/webkit-sheriff-bot &&
     58    bash configure-git-svn.sh sheriff-bot &&
     59    bash configure-git-user.sh sheriff-bot \"Sheriff Bot\" $BUGZILLA_USERNAME &&
    5860    bash build-boot-cmd.sh \"\\
    5961screen -t fq ./start-queue.sh feeder-queue $BOT_ID 10

  • trunk/Tools/EWSTools/configure-git-svn.sh

    r143359 r143360  
    1 #/bin/bash
    2 # Copyright (c) 2010 Google Inc. All rights reserved.
     1#!/bin/sh
     2# Copyright (c) 2013 Google Inc. All rights reserved.
    33#
    44# Redistribution and use in source and binary forms, with or without
    … …  
    1212# in the documentation and/or other materials provided with the
    1313# distribution.
    14 #     * Neither the name of Google Inc. nor the names of its
    15 # contributors may be used to endorse or promote products derived from
    16 # this software without specific prior written permission.
    1714#
    1815# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    … …  
    2825# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2926
    30 # These are meant to match the instructions from:
    31 # http://trac.webkit.org/wiki/UsingGitWithWebKit
    32 cd /mnt/git
    33 git clone git://git.webkit.org/WebKit.git webkit
    34 cd webkit
     27if [[ $# -ne 1 ]]; then
     28    echo "Usage: configure-git-svn.sh QUEUE_TYPE"
     29    exit 1
     30fi
    3531
    36 git svn init -T trunk http://svn.webkit.org/repository/webkit
    37 git update-ref refs/remotes/trunk origin/master
    38 # It's possible that this "config" step can get merged into an earlier setup step.
    39 git config --replace-all svn-remote.svn.fetch trunk:refs/remotes/origin/master
     32QUEUE_TYPE=$1
    4033
    41 git fetch
    42 git svn rebase
     34CWD="$(pwd)"
     35cd /mnt/git/webkit-$QUEUE_TYPE
     36
     37# These commands come from the WebKit wiki: http://trac.webkit.org/wiki/UsingGitWithWebKit
     38git svn init --prefix=origin/ -T trunk http://svn.webkit.org/repository/webkit
     39git config --replace svn-remote.svn.fetch trunk:refs/remotes/origin/master
     40git svn fetch --local
     41
     42cd "$CWD"

  • trunk/Tools/EWSTools/configure-git-user.sh

    r143359 r143360  
    1 #/bin/bash
    2 # Copyright (c) 2010 Google Inc. All rights reserved.
     1#!/bin/sh
     2# Copyright (c) 2013 Google Inc. All rights reserved.
    33#
    44# Redistribution and use in source and binary forms, with or without
    … …  
    1212# in the documentation and/or other materials provided with the
    1313# distribution.
    14 #     * Neither the name of Google Inc. nor the names of its
    15 # contributors may be used to endorse or promote products derived from
    16 # this software without specific prior written permission.
    1714#
    1815# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
    … …  
    2825# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2926
    30 # These are meant to match the instructions from:
    31 # http://trac.webkit.org/wiki/UsingGitWithWebKit
    32 cd /mnt/git
    33 git clone git://git.webkit.org/WebKit.git webkit
    34 cd webkit
     27if [[ $# -ne 3 ]]; then
     28    echo "Usage: configure-git-user.sh QUEUE_TYPE NAME EMAIL"
     29    exit 1
     30fi
    3531
    36 git svn init -T trunk http://svn.webkit.org/repository/webkit
    37 git update-ref refs/remotes/trunk origin/master
    38 # It's possible that this "config" step can get merged into an earlier setup step.
    39 git config --replace-all svn-remote.svn.fetch trunk:refs/remotes/origin/master
     32QUEUE_TYPE=$1
     33NAME="$2"
     34EMAIL=$3
    4035
    41 git fetch
    42 git svn rebase
     36if [[ "$NAME" != *" "* ]]; then
     37    echo "NAME parameter must contain a space."
     38    exit 1
     39fi
     40
     41cat >> /mnt/git/webkit-$QUEUE_TYPE/.git/config <<EOF
     42[user]
     43        name = $NAME
     44        email = $EMAIL
     45EOF
Note: See TracChangeset for help on using the changeset viewer.