Changeset 73895 in webkit

Timestamp:

Dec 13, 2010 2:19:10 AM (13 years ago)

Author:

eric@webkit.org

Message:

2010-12-13 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

EWS Queues should remove orpahned pyc files before starting
​https://bugs.webkit.org/show_bug.cgi?id=50904

A previous check added a platform.py which caused
EWS bots on some platforms to hit an import exception.
The platform.py file was removed in a subsequent commit, but
the EWS bots in question stayed stuck. This change will
fix those bots once restarted (and prevent this in the future).

I also went ahead and unified start-queue and start-commit-queue
since they were nearly identical. I also added bot_id support
to both force all EWSes to have bot ids as well as get rid of the one
remaining reason why I had my own copies of these scripts.
Hopefully this will be enough to get all the other bot admins
(ahem, Adam, ahem) to move to using these checked in copies as well.

• EWSTools/start-commit-queue.sh: Removed.
• EWSTools/start-queue.sh:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• EWSTools/start-commit-queue.sh (deleted)
• EWSTools/start-queue.sh (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-12-13  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        EWS Queues should remove orpahned pyc files before starting
+        https://bugs.webkit.org/show_bug.cgi?id=50904
+
+        A previous check added a platform.py which caused
+        EWS bots on some platforms to hit an import exception.
+        The platform.py file was removed in a subsequent commit, but
+        the EWS bots in question stayed stuck.  This change will
+        fix those bots once restarted (and prevent this in the future).
+
+        I also went ahead and unified start-queue and start-commit-queue
+        since they were nearly identical.  I also added bot_id support
+        to both force all EWSes to have bot ids as well as get rid of the one
+        remaining reason why I had my own copies of these scripts.
+        Hopefully this will be enough to get all the other bot admins
+        (ahem, Adam, ahem) to move to using these checked in copies as well.
+
+        * EWSTools/start-commit-queue.sh: Removed.
+        * EWSTools/start-queue.sh:
+
 2010-10-28  MORITA Hajime  <morrita@google.com>
 

trunk/WebKitTools/EWSTools/start-queue.sh

@@ -28 +28 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+if [[ $# -ne 2 ]];then
+echo "Usage: start-queue.sh QUEUE_NAME BOT_ID"
+echo
+echo "QUEUE_NAME will be passed as a command to webkit-patch"
+echo "QUEUE_NAME will also be used as the path to the queue: /mnt/git/webkit-QUEUE_NAME"
+echo "BOT_ID may not have spaces. It will appear as the bots name on queues.webkit.org"
+echo
+echo "For example, to run the mac-ews on a machine we're calling 'eseidel-cq-sf' run:"
+echo "start-queue.sh mac-ews eseidel-cq-sf"
+exit 1
+fi
+
 cd /mnt/git/webkit-$1
 while :
 do
-  git reset --hard
+  git reset --hard trunk
   git clean -f
+  git rebase --abort
   git fetch
   git svn rebase
-  ./WebKitTools/Scripts/webkit-patch $1 --no-confirm --exit-after-iteration 10
+  # 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.
+  ./WebKitTools/Scripts/test-webkitpy
+  ./WebKitTools/Scripts/webkit-patch $1 --bot-id=$2 --no-confirm --exit-after-iteration 10
 done