Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (206179 => 206180)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2016-09-20 22:19:16 UTC (rev 206179)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2016-09-20 22:30:29 UTC (rev 206180)
@@ -41,20 +41,6 @@
{ "name": "bot418", "platform": "mac-elcapitan" },
{ "name": "bot419", "platform": "mac-elcapitan" },
- { "name": "bot118", "platform": "mac-sierra" },
- { "name": "bot122", "platform": "mac-sierra" },
- { "name": "bot137", "platform": "mac-sierra" },
- { "name": "bot140", "platform": "mac-sierra" },
- { "name": "bot141", "platform": "mac-sierra" },
- { "name": "bot160", "platform": "mac-sierra" },
- { "name": "bot164", "platform": "mac-sierra" },
- { "name": "bot199", "platform": "mac-sierra" },
- { "name": "bot439", "platform": "mac-sierra" },
- { "name": "bot443", "platform": "mac-sierra" },
- { "name": "bot600", "platform": "mac-sierra" },
- { "name": "bot698", "platform": "mac-sierra" },
- { "name": "bot699", "platform": "mac-sierra" },
-
{ "name": "bot407", "platform": "ios-10" },
{ "name": "bot197", "platform": "ios-simulator-10" },
{ "name": "bot329", "platform": "ios-simulator-10" },
@@ -95,41 +81,7 @@
],
- "builders": [ { "name": "Apple Sierra Debug (Build)", "type": "Build", "builddir": "sierra-debug",
- "platform": "mac-sierra", "configuration": "debug", "architectures": ["x86_64"],
- "triggers": ["sierra-debug-tests-wk1", "sierra-debug-tests-wk2"],
- "slavenames": ["bot439", "bot698"]
- },
- { "name": "Apple Sierra Debug WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "sierra-debug-tests-wk1",
- "platform": "mac-sierra", "configuration": "debug", "architectures": ["x86_64"],
- "additionalArguments": ["--no-retry-failures"],
- "slavenames": ["bot118", "bot122"]
- },
- { "name": "Apple Sierra Debug WK2 (Tests)", "type": "TestAllButJSC", "builddir": "sierra-debug-tests-wk2",
- "platform": "mac-sierra", "configuration": "debug", "architectures": ["x86_64"],
- "additionalArguments": ["--no-retry-failures"],
- "slavenames": ["bot137", "bot140"]
- },
- { "name": "Apple Sierra Release (Build)", "type": "Build", "builddir": "sierra-release",
- "platform": "mac-sierra", "configuration": "release", "architectures": ["x86_64"],
- "triggers": ["sierra-release-tests-wk1", "sierra-release-tests-wk2"],
- "slavenames": ["bot443", "bot699"]
- },
- { "name": "Apple Sierra Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "sierra-release-tests-wk1",
- "platform": "mac-sierra", "configuration": "release", "architectures": ["x86_64"],
- "additionalArguments": ["--no-retry-failures"],
- "slavenames": ["bot141", "bot160"]
- },
- { "name": "Apple Sierra Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "sierra-release-tests-wk2",
- "platform": "mac-sierra", "configuration": "release", "architectures": ["x86_64"],
- "additionalArguments": ["--no-retry-failures"],
- "slavenames": ["bot164", "bot199"]
- },
- { "name": "Apple Sierra Release (32-bit Build)", "type": "Build", "builddir": "sierra-32bit-release",
- "platform": "mac-sierra", "configuration": "release", "architectures": ["i386"],
- "slavenames": ["bot600"]
- },
- { "name": "Apple El Capitan Debug (Build)", "type": "Build", "builddir": "elcapitan-debug",
+ "builders": [ { "name": "Apple El Capitan Debug (Build)", "type": "Build", "builddir": "elcapitan-debug",
"platform": "mac-elcapitan", "configuration": "debug", "architectures": ["x86_64"],
"triggers": ["elcapitan-debug-tests-jsc", "elcapitan-debug-tests-wk1", "elcapitan-debug-tests-wk2"],
"slavenames": ["bot415", "bot416"]
@@ -396,9 +348,6 @@
{ "type": "PlatformSpecificScheduler", "platform": "mac-elcapitan", "branch": "trunk", "treeStableTimer": 45.0,
"builderNames": ["Apple El Capitan Release (Build)", "Apple El Capitan Debug (Build)", "Apple El Capitan LLINT CLoop (BuildAndTest)", "Apple El Capitan 32-bit JSC (BuildAndTest)", "Apple El Capitan Release (32-bit Build)", "Apple El Capitan CMake Debug (Build)"]
},
- { "type": "PlatformSpecificScheduler", "platform": "mac-sierra", "branch": "trunk", "treeStableTimer": 45.0,
- "builderNames": ["Apple Sierra Release (Build)", "Apple Sierra Debug (Build)", "Apple Sierra Release (32-bit Build)"]
- },
{ "type": "PlatformSpecificScheduler", "platform": "ios-10", "branch": "trunk", "treeStableTimer": 45.0,
"builderNames": ["Apple iOS 10 Release (Build)"]
},
@@ -408,18 +357,6 @@
{ "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0,
"builderNames": ["Apple Win Release (Build)", "Apple Win Debug (Build)"]
},
- { "type": "Triggerable", "name": "sierra-release-tests-wk1",
- "builderNames": ["Apple Sierra Release WK1 (Tests)"]
- },
- { "type": "Triggerable", "name": "sierra-release-tests-wk2",
- "builderNames": ["Apple Sierra Release WK2 (Tests)"]
- },
- { "type": "Triggerable", "name": "sierra-debug-tests-wk1",
- "builderNames": ["Apple Sierra Debug WK1 (Tests)"]
- },
- { "type": "Triggerable", "name": "sierra-debug-tests-wk2",
- "builderNames": ["Apple Sierra Debug WK2 (Tests)"]
- },
{ "type": "Triggerable", "name": "elcapitan-leaks",
"builderNames": ["Apple El Capitan (Leaks)"]
},
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (206179 => 206180)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2016-09-20 22:19:16 UTC (rev 206179)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2016-09-20 22:30:29 UTC (rev 206180)
@@ -398,14 +398,6 @@
'Apple El Capitan Release WK1 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
'Apple El Capitan Release WK2 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
- 'Apple Sierra Debug (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
- 'Apple Sierra Debug WK1 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
- 'Apple Sierra Debug WK2 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
- 'Apple Sierra Release (32-bit Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
- 'Apple Sierra Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
- 'Apple Sierra Release WK1 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
- 'Apple Sierra Release WK2 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
-
'Apple iOS 10 Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
'Apple iOS 10 Simulator Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'trigger'],
'Apple iOS 10 Simulator Release WK1 (Tests)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js (206179 => 206180)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2016-09-20 22:19:16 UTC (rev 206179)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js 2016-09-20 22:30:29 UTC (rev 206180)
@@ -26,13 +26,6 @@
WebKitBuildbot = function()
{
const queueInfo = {
- "Apple Sierra Debug (Build)": {platform: Dashboard.Platform.macOSSierra, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
- "Apple Sierra Release (Build)": {platform: Dashboard.Platform.macOSSierra, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
- "Apple Sierra Release (32-bit Build)": {platform: Dashboard.Platform.macOSSierra, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
- "Apple Sierra Debug WK1 (Tests)": {platform: Dashboard.Platform.macOSSierra, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
- "Apple Sierra Debug WK2 (Tests)": {platform: Dashboard.Platform.macOSSierra, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
- "Apple Sierra Release WK1 (Tests)": {platform: Dashboard.Platform.macOSSierra, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
- "Apple Sierra Release WK2 (Tests)": {platform: Dashboard.Platform.macOSSierra, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
"Apple El Capitan Debug (Build)": {platform: Dashboard.Platform.MacOSXElCapitan, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
"Apple El Capitan Release (Build)": {platform: Dashboard.Platform.MacOSXElCapitan, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
"Apple El Capitan Release (32-bit Build)": {platform: Dashboard.Platform.MacOSXElCapitan, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
Modified: trunk/Tools/ChangeLog (206179 => 206180)
--- trunk/Tools/ChangeLog 2016-09-20 22:19:16 UTC (rev 206179)
+++ trunk/Tools/ChangeLog 2016-09-20 22:30:29 UTC (rev 206180)
@@ -1,3 +1,15 @@
+2016-09-20 Ryan Haddad <ryanhad...@apple.com>
+
+ Unreviewed, rolling out r206178.
+
+ This change caused buildbot config issues.
+
+ Reverted changeset:
+
+ "Add Sierra bots to buildbot and dashboard."
+ https://bugs.webkit.org/show_bug.cgi?id=162249
+ http://trac.webkit.org/changeset/206178
+
2016-09-20 Dean Johnson <dean_john...@apple.com>
Add Sierra bots to buildbot and dashboard.
