Log Message
Workaround buildbot bug when merging build requests. https://bugs.webkit.org/show_bug.cgi?id=88158
Reviewed by Mark Rowe. For expediency, we still want testers to pick the latest build to test, but to ensure that the builders are reporting the correct revision number, we should let the building bots run as they normally would. That is, the builder picks the oldest revision, and merges subsequent requests. Because merged requests get appended to the list of changes for a given build, the last change in that list is also the latest change. When we used pickLatestBuild for the builders, this was not the case (it would always report the penultimate change). http://trac.buildbot.net/ticket/2309 is tracking the buildbot bug. * BuildSlaveSupport/build.webkit.org-config/config.json: Remove the mergeRequests override for all Apple builders. * BuildSlaveSupport/build.webkit.org-config/master.cfg: Have only non-building bots pick the latest build to run. (loadBuilderConfig):
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (119518 => 119519)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2012-06-05 20:38:21 UTC (rev 119518)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2012-06-05 20:41:41 UTC (rev 119519)
@@ -70,13 +70,11 @@
"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"],
- "mergeRequests": false
+ "slavenames": ["apple-xserve-4", "test-slave"]
},
{ "name": "SnowLeopard Intel Debug (Build)", "type": "Build", "builddir": "snowleopard-intel-debug",
"platform": "mac-snowleopard", "configuration": "debug", "architectures": ["x86_64"],
- "slavenames": ["apple-xserve-9"],
- "mergeRequests": false
+ "slavenames": ["apple-xserve-9"]
},
{ "name": "Lion Leaks", "type": "BuildAndTestLeaks", "builddir": "lion-intel-leaks",
"platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"],
@@ -85,14 +83,12 @@
{ "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"],
- "mergeRequests": false
+ "slavenames": ["apple-xserve-2", "apple-xserve-10"]
},
{ "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"],
- "mergeRequests": false
+ "slavenames": ["apple-xserve-3"]
},
{ "name": "Lion Debug (Tests)", "type": "Test", "builddir": "lion-intel-debug-tests",
"platform": "mac-lion", "configuration": "debug", "architectures": ["x86_64"],
@@ -119,8 +115,7 @@
"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"],
- "mergeRequests": false
+ "slavenames": ["apple-windows-2", "test-slave"]
},
{
"name": "Windows 7 Release (Tests)", "type": "Test", "builddir": "win-release-tests",
@@ -131,8 +126,7 @@
"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"],
- "mergeRequests": false
+ "slavenames": ["apple-windows-1", "test-slave"]
},
{
"name": "Windows XP Debug (Tests)", "type": "Test", "builddir": "win-debug-tests",
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (119518 => 119519)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-06-05 20:38:21 UTC (rev 119518)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2012-06-05 20:41:41 UTC (rev 119519)
@@ -884,7 +884,7 @@
else:
builder["category"] = 'misc'
- if builder['category'] == 'AppleMac' or builder['category'] == 'AppleWin':
+ if (builder['category'] == 'AppleMac' or builder['category'] == 'AppleWin') and builder['type'] != 'Build':
builder['nextBuild'] = pickLatestBuild
c['builders'].append(builder)
Modified: trunk/Tools/ChangeLog (119518 => 119519)
--- trunk/Tools/ChangeLog 2012-06-05 20:38:21 UTC (rev 119518)
+++ trunk/Tools/ChangeLog 2012-06-05 20:41:41 UTC (rev 119519)
@@ -1,3 +1,25 @@
+2012-06-05 Jon Lee <[email protected]>
+
+ Workaround buildbot bug when merging build requests.
+ https://bugs.webkit.org/show_bug.cgi?id=88158
+
+ Reviewed by Mark Rowe.
+
+ For expediency, we still want testers to pick the latest build to test, but to ensure
+ that the builders are reporting the correct revision number, we should let the building bots
+ run as they normally would. That is, the builder picks the oldest revision, and merges
+ subsequent requests. Because merged requests get appended to the list of changes for a given
+ build, the last change in that list is also the latest change. When we used pickLatestBuild
+ for the builders, this was not the case (it would always report the penultimate change).
+
+ http://trac.buildbot.net/ticket/2309 is tracking the buildbot bug.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json: Remove the mergeRequests override
+ for all Apple builders.
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg: Have only non-building bots pick
+ the latest build to run.
+ (loadBuilderConfig):
+
2012-06-05 Jessie Berlin <[email protected]>
[Win] DumpRenderTree should call resetInternalsObject
_______________________________________________ webkit-changes mailing list [email protected] http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
