Title: [146376] trunk/Tools
Revision
146376
Author
roger_f...@apple.com
Date
2013-03-20 12:22:00 -0700 (Wed, 20 Mar 2013)

Log Message

Test fix for Win EWS bots, catch various errors and restart script if necessary.

* EWSTools/start-queue-win.sh:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (146375 => 146376)


--- trunk/Tools/ChangeLog	2013-03-20 19:19:53 UTC (rev 146375)
+++ trunk/Tools/ChangeLog	2013-03-20 19:22:00 UTC (rev 146376)
@@ -1,3 +1,9 @@
+2013-03-20  Roger Fong  <roger_f...@apple.com>
+
+        Test fix for Win EWS bots, catch various errors and restart script if necessary.
+
+        * EWSTools/start-queue-win.sh:
+
 2013-03-20  Sami Kyostila  <skyos...@chromium.org>
 
         Unreviewed, add myself to committers.py.

Modified: trunk/Tools/EWSTools/start-queue-win.sh (146375 => 146376)


--- trunk/Tools/EWSTools/start-queue-win.sh	2013-03-20 19:19:53 UTC (rev 146375)
+++ trunk/Tools/EWSTools/start-queue-win.sh	2013-03-20 19:22:00 UTC (rev 146376)
@@ -2,36 +2,49 @@
 export WEBKIT_BUGZILLA_USERNAME=$1
 export WEBKIT_BUGZILLA_PASSWORD=$2
 export BOT_ID=$3
-while :
-do
-	date
-	echo "TASK: cleaning up old log files."
-    cd ~/win-ews-logs
-    rm -rf win-ews.old
-    mv win-ews.log win-ews.old
-    find ~/win-ews-logs -mtime +7 -exec rm -f {} \;
-    echo "TASK: Starting up"
-	cd ~/WebKit
-	echo "TASK: Cleaning WebKitBuild"
-	rm -rf WebKitBuild
-	date
-	echo "TASK: Cleaning up"
-	svn cleanup
-	date
-	echo "TASK: svn revert -R *"
-	svn revert -R *
-	date
-	echo "TASK: svn status"
-	svn status | grep "?" | awk '{print $2}' | xargs rm -rf
-	date
-	echo "TASK: webkit-patch clean"
-	~/WebKit/Tools/Scripts/webkit-patch clean
-	date
-	echo "TASK: svn up --non-interactive"
-	svn up --non-interactive
-	date
-	echo "TASK: kill orphaned tasks"
-	taskkill.exe /f /im cl.exe
-	echo "TASK: webkit-patch win-ews"
-	~/WebKit/Tools/Scripts/webkit-patch win-ews --bot-id=$BOT_ID --no-confirm --exit-after-iteration 10
-done
+
+function error_handler()
+{
+    start_ews
+}
+
+function start_ews()
+{
+    trap 'error_handler ${LINENO} $?' ERR
+
+    while :
+    do
+        date
+        echo "TASK: cleaning up old log files."
+        cd ~/win-ews-logs
+        rm -rf win-ews.old
+        mv win-ews.log win-ews.old
+        find ~/win-ews-logs -mtime +7 -exec rm -f {} \;
+        echo "TASK: Starting up"
+        cd ~/WebKit
+        echo "TASK: Cleaning WebKitBuild"
+        rm -rf WebKitBuild
+        date
+        echo "TASK: Cleaning up"
+        svn cleanup
+        date
+        echo "TASK: svn revert -R *"
+        svn revert -R *
+        date
+        echo "TASK: svn status"
+        svn status | grep "?" | awk '{print $2}' | xargs rm -rf
+        date
+        echo "TASK: webkit-patch clean"
+        ~/WebKit/Tools/Scripts/webkit-patch clean
+        date
+        echo "TASK: svn up --non-interactive"
+        svn up --non-interactive
+        date
+        echo "TASK: kill orphaned tasks"
+        taskkill.exe /f /im cl.exe
+        echo "TASK: webkit-patch win-ews"
+        ~/WebKit/Tools/Scripts/webkit-patch win-ews --bot-id=$BOT_ID --no-confirm --exit-after-iteration 10
+    done
+}
+
+start_ews
\ No newline at end of file
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to