Title: [119305] trunk/Tools
Revision
119305
Author
timothy_hor...@apple.com
Date
2012-06-01 18:26:38 -0700 (Fri, 01 Jun 2012)

Log Message

Lots of "failed download-built-product" on Apple bots
https://bugs.webkit.org/show_bug.cgi?id=88158

Reviewed by Jessie Berlin.

Disable mergeRequests on all Apple builders. This is a speculative fix.

* BuildSlaveSupport/build.webkit.org-config/config.json:

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (119304 => 119305)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2012-06-02 01:00:48 UTC (rev 119304)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2012-06-02 01:26:38 UTC (rev 119305)
@@ -70,11 +70,13 @@
 
     "builders":   [ { "name": "SnowLeopard Intel Release (Build)", "type": "Build", "builddir": "snowleopard-intel-release",
                       "platform": "mac-snowleopard", "configuration": "release", "architectures": ["x86_64"],
-                      "slavenames": ["apple-xserve-4", "test-slave"]
+                      "slavenames": ["apple-xserve-4", "test-slave"],
+                      "mergeRequests": false
                     },
                     { "name": "SnowLeopard Intel Debug (Build)", "type": "Build", "builddir": "snowleopard-intel-debug",
                       "platform": "mac-snowleopard", "configuration": "debug", "architectures": ["x86_64"],
-                      "slavenames": ["apple-xserve-9"]
+                      "slavenames": ["apple-xserve-9"],
+                      "mergeRequests": false
                     },
                     { "name": "Lion Leaks", "type": "BuildAndTestLeaks", "builddir": "lion-intel-leaks",
                       "platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"],
@@ -83,12 +85,14 @@
                     { "name": "Lion Debug (Build)", "type": "Build", "builddir": "lion-intel-debug",
                       "platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"],
                       "triggers": ["lion-intel-debug-tests", "lion-intel-debug-tests-wk2"],
-                      "slavenames": ["apple-xserve-2", "apple-xserve-10"]
+                      "slavenames": ["apple-xserve-2", "apple-xserve-10"],
+                      "mergeRequests": false
                     },
                     { "name": "Lion Release (Build)", "type": "Build", "builddir": "lion-intel-release",
                       "platform": "mac-lion", "configuration": "release", "architectures": ["x86_64"],
                       "triggers": ["lion-intel-release-tests", "lion-intel-release-tests-wk2", "lion-intel-release-perf"],
-                      "slavenames": ["apple-xserve-3"]
+                      "slavenames": ["apple-xserve-3"],
+                      "mergeRequests": false
                     },
                     { "name": "Lion Debug (Tests)", "type": "Test", "builddir": "lion-intel-debug-tests",
                       "platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"],
@@ -115,7 +119,8 @@
                       "name": "Windows Release (Build)", "type": "Build", "builddir": "win-release",
                       "platform": "win", "configuration": "release", "architectures": ["i386"],
                       "triggers": ["win-release-tests", "win-release-tests-wk2"],
-                      "slavenames": ["apple-windows-2", "test-slave"]
+                      "slavenames": ["apple-windows-2", "test-slave"],
+                      "mergeRequests": false
                     },
                     {
                       "name": "Windows 7 Release (Tests)", "type": "Test", "builddir": "win-release-tests",
@@ -126,7 +131,8 @@
                       "name": "Windows Debug (Build)", "type": "Build", "builddir": "win-debug",
                       "platform": "win", "configuration": "debug", "architectures": ["i386"],
                       "triggers": ["win-debug-tests"],
-                      "slavenames": ["apple-windows-1", "test-slave"]
+                      "slavenames": ["apple-windows-1", "test-slave"],
+                      "mergeRequests": false
                     },
                     {
                       "name": "Windows XP Debug (Tests)", "type": "Test", "builddir": "win-debug-tests",

Modified: trunk/Tools/ChangeLog (119304 => 119305)


--- trunk/Tools/ChangeLog	2012-06-02 01:00:48 UTC (rev 119304)
+++ trunk/Tools/ChangeLog	2012-06-02 01:26:38 UTC (rev 119305)
@@ -1,3 +1,14 @@
+2012-06-01  Tim Horton  <timothy_hor...@apple.com>
+
+        Lots of "failed download-built-product" on Apple bots
+        https://bugs.webkit.org/show_bug.cgi?id=88158
+
+        Reviewed by Jessie Berlin.
+        
+        Disable mergeRequests on all Apple builders. This is a speculative fix.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+
 2012-06-01  Sheriff Bot  <webkit.review....@gmail.com>
 
         Unreviewed, rolling out r119297.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to