Title: [121644] trunk/Tools
Revision
121644
Author
[email protected]
Date
2012-07-01 17:08:17 -0700 (Sun, 01 Jul 2012)

Log Message

Unreviewed.

It turns out we need to use Ubuntu 10.04 to get the right image results
for chromium-linux. This patch updates our scripts to be compatible
with Ubuntu 10.04.

* EWSTools/cold-boot.sh:
    - fdisk doesn't have p and 1 as default commands in 10.04.
* EWSTools/start-queue.sh:
    - git doesn't understanding the -B argument in 10.04. We've been
      using this change locally on the EC2 bots for a while.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (121643 => 121644)


--- trunk/Tools/ChangeLog	2012-07-01 23:08:01 UTC (rev 121643)
+++ trunk/Tools/ChangeLog	2012-07-02 00:08:17 UTC (rev 121644)
@@ -2,6 +2,20 @@
 
         Unreviewed.
 
+        It turns out we need to use Ubuntu 10.04 to get the right image results
+        for chromium-linux. This patch updates our scripts to be compatible
+        with Ubuntu 10.04.
+
+        * EWSTools/cold-boot.sh:
+            - fdisk doesn't have p and 1 as default commands in 10.04.
+        * EWSTools/start-queue.sh:
+            - git doesn't understanding the -B argument in 10.04. We've been
+              using this change locally on the EC2 bots for a while.
+
+2012-07-01  Adam Barth  <[email protected]>
+
+        Unreviewed.
+
         * EWSTools/boot.sh:
             - We need to start the screen in detached mode so that we can run
               it remotely via ssh.

Modified: trunk/Tools/EWSTools/cold-boot.sh (121643 => 121644)


--- trunk/Tools/EWSTools/cold-boot.sh	2012-07-01 23:08:01 UTC (rev 121643)
+++ trunk/Tools/EWSTools/cold-boot.sh	2012-07-02 00:08:17 UTC (rev 121644)
@@ -35,10 +35,10 @@
 # Format the disk
 cat <<EOF | sudo fdisk /dev/vdb
 n
+p
+1
 
 
-
-
 w
 EOF
 

Modified: trunk/Tools/EWSTools/start-queue.sh (121643 => 121644)


--- trunk/Tools/EWSTools/start-queue.sh	2012-07-01 23:08:01 UTC (rev 121643)
+++ trunk/Tools/EWSTools/start-queue.sh	2012-07-02 00:08:17 UTC (rev 121644)
@@ -38,7 +38,9 @@
   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 -fB master # Re-create master from origin/master.
+  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.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to