Title: [139420] trunk/Tools
- Revision
- 139420
- Author
- [email protected]
- Date
- 2013-01-11 02:11:47 -0800 (Fri, 11 Jan 2013)
Log Message
Allow arbitrary queue launch parameters in EWSTools/start-queue.sh
https://bugs.webkit.org/show_bug.cgi?id=106636
Patch by Alan Cutter <[email protected]> on 2013-01-11
Reviewed by Adam Barth.
This parameter will allow the bot boot script to use start-queue.sh and provide an IRC password for sheriffbot.
* EWSTools/GoogleComputeEngine/build-chromium-ews.sh:
* EWSTools/GoogleComputeEngine/build-commit-queue.sh:
* EWSTools/screen-config:
* EWSTools/start-queue.sh:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (139419 => 139420)
--- trunk/Tools/ChangeLog 2013-01-11 10:07:49 UTC (rev 139419)
+++ trunk/Tools/ChangeLog 2013-01-11 10:11:47 UTC (rev 139420)
@@ -1,3 +1,17 @@
+2013-01-11 Alan Cutter <[email protected]>
+
+ Allow arbitrary queue launch parameters in EWSTools/start-queue.sh
+ https://bugs.webkit.org/show_bug.cgi?id=106636
+
+ Reviewed by Adam Barth.
+
+ This parameter will allow the bot boot script to use start-queue.sh and provide an IRC password for sheriffbot.
+
+ * EWSTools/GoogleComputeEngine/build-chromium-ews.sh:
+ * EWSTools/GoogleComputeEngine/build-commit-queue.sh:
+ * EWSTools/screen-config:
+ * EWSTools/start-queue.sh:
+
2013-01-10 Ryosuke Niwa <[email protected]>
kill-old-processes and delete-stale-build-files use CRLF linebreaks
Modified: trunk/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh (139419 => 139420)
--- trunk/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh 2013-01-11 10:07:49 UTC (rev 139419)
+++ trunk/Tools/EWSTools/GoogleComputeEngine/build-chromium-ews.sh 2013-01-11 10:11:47 UTC (rev 139420)
@@ -54,6 +54,6 @@
cd tools &&
bash build-vm.sh &&
bash build-repo.sh $QUEUE_TYPE $BUGZILLA_USERNAME $BUGZILLA_PASSWORD &&
- bash build-boot-cmd.sh \"screen -t kr ./start-queue.sh $QUEUE_TYPE $BOT_ID\" &&
+ bash build-boot-cmd.sh \"screen -t kr ./start-queue.sh $QUEUE_TYPE $BOT_ID 10\" &&
bash boot.sh
"
Modified: trunk/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh (139419 => 139420)
--- trunk/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh 2013-01-11 10:07:49 UTC (rev 139419)
+++ trunk/Tools/EWSTools/GoogleComputeEngine/build-commit-queue.sh 2013-01-11 10:11:47 UTC (rev 139420)
@@ -58,6 +58,6 @@
bash configure-svn-auth.sh $SVN_USERNAME $SVN_PASSWORD &&
bash build-vm.sh &&
bash build-repo.sh $QUEUE_TYPE $BUGZILLA_USERNAME $BUGZILLA_PASSWORD &&
- bash build-boot-cmd.sh \"screen -t kr ./start-queue.sh $QUEUE_TYPE $BOT_ID\" &&
+ bash build-boot-cmd.sh \"screen -t kr ./start-queue.sh $QUEUE_TYPE $BOT_ID 10\" &&
bash boot.sh
"
Modified: trunk/Tools/EWSTools/screen-config (139419 => 139420)
--- trunk/Tools/EWSTools/screen-config 2013-01-11 10:07:49 UTC (rev 139419)
+++ trunk/Tools/EWSTools/screen-config 2013-01-11 10:11:47 UTC (rev 139420)
@@ -1,4 +1,4 @@
-screen -t style ./start-queue.sh style-queue
-screen -t qt ./start-queue.sh qt-ews
-screen -t kr ./start-queue.sh chromium-ews
-screen -t gtk ./start-queue.sh gtk-ews
+screen -t style ./start-queue.sh style-queue 10
+screen -t qt ./start-queue.sh qt-ews 10
+screen -t kr ./start-queue.sh chromium-ews 10
+screen -t gtk ./start-queue.sh gtk-ews 10
Modified: trunk/Tools/EWSTools/start-queue.sh (139419 => 139420)
--- trunk/Tools/EWSTools/start-queue.sh 2013-01-11 10:07:49 UTC (rev 139419)
+++ trunk/Tools/EWSTools/start-queue.sh 2013-01-11 10:11:47 UTC (rev 139420)
@@ -27,31 +27,38 @@
# (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
+ echo "Usage: start-queue-loop.sh QUEUE_NAME BOT_ID RESET_AFTER_ITERATION [QUEUE_PARAMS]"
+ exit 1
+fi
+
QUEUE_NAME=$1
BOT_ID=$2
+RESET_AFTER_ITERATION=$3
+QUEUE_PARAMS=$4
cd /mnt/git/webkit-$QUEUE_NAME
while :
do
- # This somewhat quirky sequence of steps seems to clear up all the broken
- # git situations we've gotten ourself into in the past.
- git clean -f # Remove any left-over layout test results, added files, etc.
- git rebase --abort # If we got killed during a git rebase, we need to clean up.
- git fetch origin # Avoid updating the working copy to a stale revision.
- git checkout origin/master -f
- git branch -D master
- git checkout origin/master -b master
+ # This somewhat quirky sequence of steps seems to clear up all the broken
+ # git situations we've gotten ourself into in the past.
+ git clean -f # Remove any left-over layout test results, added files, etc.
+ git rebase --abort # If we got killed during a git rebase, we need to clean up.
+ git fetch origin # Avoid updating the working copy to a stale revision.
+ git checkout origin/master -f
+ git branch -D master
+ git checkout origin/master -b master
- # Most queues auto-update as part of their normal operation, but updating
- # here makes sure that we get the latest version of the master process.
- ./Tools/Scripts/update-webkit
+ # Most queues auto-update as part of their normal operation, but updating
+ # here makes sure that we get the latest version of the master process.
+ ./Tools/Scripts/update-webkit
- # test-webkitpy has code to remove orphaned .pyc files, so we
- # run it before running webkit-patch to avoid stale .pyc files
- # preventing webkit-patch from launching.
- ./Tools/Scripts/test-webkitpy
+ # test-webkitpy has code to remove orphaned .pyc files, so we
+ # run it before running webkit-patch to avoid stale .pyc files
+ # preventing webkit-patch from launching.
+ ./Tools/Scripts/test-webkitpy
- # We use --exit-after-iteration to pick up any changes to webkit-patch, including
- # changes to the committers.py file.
- ./Tools/Scripts/webkit-patch $QUEUE_NAME --bot-id=$BOT_ID --no-confirm --exit-after-iteration 10
+ # We use --exit-after-iteration to pick up any changes to webkit-patch, including
+ # changes to the committers.py file.
+ ./Tools/Scripts/webkit-patch $QUEUE_NAME --bot-id=$BOT_ID --no-confirm --exit-after-iteration $RESET_AFTER_ITERATION $QUEUE_PARAMS
done
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
