Skip to content

Commit 256bb89

Browse files
author
[email protected]
committed
Update bot configuration for iOS 11.
https://bugs.webkit.org/show_bug.cgi?id=177165 Reviewed by Alexey Proskuryakov. * BuildSlaveSupport/build.webkit.org-config/config.json: * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py: * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js: (BubbleQueueServer): * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js: * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js: (WebKitBuildbot): * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Styles/Main.css: (table.queue-grid tr.platform.ios-simulator-10 img.logo): Deleted. (table.queue-grid tr.platform.ios-10 img.logo): Deleted. * BuildSlaveSupport/build.webkit.org-config/wkbuild.py: (_should_file_trigger_build): * BuildSlaveSupport/build.webkit.org-config/wkbuild_unittest.py: (ShouldBuildTest): (ShouldBuildTest.test_should_build): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@222229 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 7f47e4d commit 256bb89

File tree

9 files changed

+86
-96
lines changed

9 files changed

+86
-96
lines changed

‎Tools/BuildSlaveSupport/build.webkit.org-config/config.json

+34-51
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,19 @@
4242
{ "name": "bot698", "platform": "mac-sierra" },
4343
{ "name": "bot699", "platform": "mac-sierra" },
4444

45-
{ "name": "bot673", "platform": "ios-10" },
46-
{ "name": "bot197", "platform": "ios-simulator-10" },
47-
{ "name": "bot626", "platform": "ios-simulator-10" },
48-
{ "name": "bot618", "platform": "ios-simulator-10" },
49-
{ "name": "bot620", "platform": "ios-simulator-10" },
50-
{ "name": "bot621", "platform": "ios-simulator-10" },
51-
{ "name": "bot215", "platform": "ios-simulator-10" },
52-
{ "name": "bot216", "platform": "ios-simulator-10" },
53-
{ "name": "bot217", "platform": "ios-simulator-10" },
54-
{ "name": "bot651", "platform": "ios-simulator-10" },
55-
{ "name": "bot652", "platform": "ios-simulator-10" },
56-
{ "name": "bot653", "platform": "ios-simulator-10" },
57-
{ "name": "bot654", "platform": "ios-simulator-10" },
45+
{ "name": "bot673", "platform": "ios-11" },
46+
{ "name": "bot197", "platform": "ios-simulator-11" },
47+
{ "name": "bot626", "platform": "ios-simulator-11" },
48+
{ "name": "bot618", "platform": "ios-simulator-11" },
49+
{ "name": "bot620", "platform": "ios-simulator-11" },
50+
{ "name": "bot621", "platform": "ios-simulator-11" },
51+
{ "name": "bot215", "platform": "ios-simulator-11" },
52+
{ "name": "bot216", "platform": "ios-simulator-11" },
53+
{ "name": "bot217", "platform": "ios-simulator-11" },
54+
{ "name": "bot651", "platform": "ios-simulator-11" },
55+
{ "name": "bot652", "platform": "ios-simulator-11" },
56+
{ "name": "bot653", "platform": "ios-simulator-11" },
57+
{ "name": "bot654", "platform": "ios-simulator-11" },
5858

5959
{ "name": "bot516", "platform": "win" },
6060
{ "name": "bot514", "platform": "win" },
@@ -209,43 +209,32 @@
209209
"slavenames": ["bot434"]
210210
},
211211
{
212-
"name": "Apple iOS 10 Release (Build)", "type": "Build", "builddir": "ios-10-release",
213-
"platform": "ios-10", "configuration": "release", "architectures": ["armv7s", "arm64"],
212+
"name": "Apple iOS 11 Release (Build)", "type": "Build", "builddir": "ios-11-release",
213+
"platform": "ios-11", "configuration": "release", "architectures": ["arm64"],
214214
"slavenames": ["bot673"]
215215
},
216216
{
217-
"name": "Apple iOS 10 Simulator Release (Build)", "type": "Build", "builddir": "ios-simulator-10-release",
218-
"platform": "ios-simulator-10", "configuration": "release", "architectures": ["x86_64"],
219-
"triggers": ["ios-simulator-10-release-tests-wk1", "ios-simulator-10-release-tests-wk2"],
217+
"name": "Apple iOS 11 Simulator Release (Build)", "type": "Build", "builddir": "ios-simulator-11-release",
218+
"platform": "ios-simulator-11", "configuration": "release", "architectures": ["x86_64"],
219+
"triggers": ["ios-simulator-11-release-tests-wk1", "ios-simulator-11-release-tests-wk2"],
220220
"slavenames": ["bot618", "bot620"]
221221
},
222222
{
223-
"name": "Apple iOS 10 Simulator Debug (Build)", "type": "Build", "builddir": "ios-simulator-10-debug",
224-
"platform": "ios-simulator-10", "configuration": "debug", "architectures": ["x86_64"],
225-
"triggers": ["ios-simulator-10-debug-tests-wk1", "ios-simulator-10-debug-tests-wk2"],
223+
"name": "Apple iOS 11 Simulator Debug (Build)", "type": "Build", "builddir": "ios-simulator-11-debug",
224+
"platform": "ios-simulator-11", "configuration": "debug", "architectures": ["x86_64"],
225+
"triggers": ["ios-simulator-11-debug-tests-wk1", "ios-simulator-11-debug-tests-wk2"],
226226
"slavenames": ["bot626", "bot621"]
227227
},
228228
{
229-
"name": "Apple iOS 10 Simulator Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "ios-simulator-10-release-tests-wk1",
230-
"platform": "ios-simulator-10", "configuration": "release", "architectures": ["x86_64"],
231-
"additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
232-
"slavenames": ["bot197", "bot215"]
233-
},
234-
{
235-
"name": "Apple iOS 10 Simulator Debug WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "ios-simulator-10-debug-tests-wk1",
236-
"platform": "ios-simulator-10", "configuration": "debug", "architectures": ["x86_64"],
237-
"additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
238-
"slavenames": ["bot216", "bot217"]
239-
},
240-
{
241-
"name": "Apple iOS 10 Simulator Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-10-release-tests-wk2",
242-
"platform": "ios-simulator-10", "configuration": "release", "architectures": ["x86_64"],
229+
230+
"name": "Apple iOS 11 Simulator Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-11-release-tests-wk2",
231+
"platform": "ios-simulator-11", "configuration": "release", "architectures": ["x86_64"],
243232
"additionalArguments": ["--no-retry-failures"],
244233
"slavenames": ["bot651", "bot652"]
245234
},
246235
{
247-
"name": "Apple iOS 10 Simulator Debug WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-10-debug-tests-wk2",
248-
"platform": "ios-simulator-10", "configuration": "debug", "architectures": ["x86_64"],
236+
"name": "Apple iOS 11 Simulator Debug WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-11-debug-tests-wk2",
237+
"platform": "ios-simulator-11", "configuration": "debug", "architectures": ["x86_64"],
249238
"additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
250239
"slavenames": ["bot653", "bot654"]
251240
},
@@ -375,11 +364,11 @@
375364
{ "type": "PlatformSpecificScheduler", "platform": "mac-sierra", "branch": "trunk", "treeStableTimer": 45.0,
376365
"builderNames": ["Apple Sierra Release (Build)", "Apple Sierra Debug (Build)", "Apple Sierra Release (32-bit Build)", "Apple Sierra LLINT CLoop (BuildAndTest)", "Apple Sierra 32-bit JSC (BuildAndTest)"]
377366
},
378-
{ "type": "PlatformSpecificScheduler", "platform": "ios-10", "branch": "trunk", "treeStableTimer": 45.0,
379-
"builderNames": ["Apple iOS 10 Release (Build)"]
367+
{ "type": "PlatformSpecificScheduler", "platform": "ios-11", "branch": "trunk", "treeStableTimer": 45.0,
368+
"builderNames": ["Apple iOS 11 Release (Build)"]
380369
},
381-
{ "type": "PlatformSpecificScheduler", "platform": "ios-simulator-10", "branch": "trunk", "treeStableTimer": 45.0,
382-
"builderNames": ["Apple iOS 10 Simulator Release (Build)", "Apple iOS 10 Simulator Debug (Build)"]
370+
{ "type": "PlatformSpecificScheduler", "platform": "ios-simulator-11", "branch": "trunk", "treeStableTimer": 45.0,
371+
"builderNames": ["Apple iOS 11 Simulator Release (Build)", "Apple iOS 11 Simulator Debug (Build)"]
383372
},
384373
{ "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0,
385374
"builderNames": ["Apple Win Release (Build)", "Apple Win Debug (Build)"]
@@ -432,17 +421,11 @@
432421
{ "type": "Triggerable", "name": "elcapitan-release-tests-test262",
433422
"builderNames": ["Apple El Capitan Release Test262 (Tests)"]
434423
},
435-
{ "type": "Triggerable", "name": "ios-simulator-10-release-tests-wk1",
436-
"builderNames": ["Apple iOS 10 Simulator Release WK1 (Tests)"]
437-
},
438-
{ "type": "Triggerable", "name": "ios-simulator-10-debug-tests-wk1",
439-
"builderNames": ["Apple iOS 10 Simulator Debug WK1 (Tests)"]
440-
},
441-
{ "type": "Triggerable", "name": "ios-simulator-10-release-tests-wk2",
442-
"builderNames": ["Apple iOS 10 Simulator Release WK2 (Tests)"]
424+
{ "type": "Triggerable", "name": "ios-simulator-11-release-tests-wk2",
425+
"builderNames": ["Apple iOS 11 Simulator Release WK2 (Tests)"]
443426
},
444-
{ "type": "Triggerable", "name": "ios-simulator-10-debug-tests-wk2",
445-
"builderNames": ["Apple iOS 10 Simulator Debug WK2 (Tests)"]
427+
{ "type": "Triggerable", "name": "ios-simulator-11-debug-tests-wk2",
428+
"builderNames": ["Apple iOS 11 Simulator Debug WK2 (Tests)"]
446429
},
447430
{ "type": "Triggerable", "name": "win-release-tests",
448431
"builderNames": ["Apple Win 7 Release (Tests)"]

‎Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py

+6-8
Original file line numberDiff line numberDiff line change
@@ -438,14 +438,12 @@ def doTest(self):
438438
'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', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
439439
'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', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
440440

441-
'Apple iOS 10 Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
442-
'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', 'archive-built-product', 'upload', 'transfer-to-s3', 'trigger'],
443-
'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', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
444-
'Apple iOS 10 Simulator 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', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
445-
446-
'Apple iOS 10 Simulator Debug (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'archive-built-product', 'upload', 'transfer-to-s3', 'trigger'],
447-
'Apple iOS 10 Simulator 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', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
448-
'Apple iOS 10 Simulator 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', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
441+
'Apple iOS 11 Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit'],
442+
'Apple iOS 11 Simulator Release (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'archive-built-product', 'upload', 'transfer-to-s3', 'trigger'],
443+
'Apple iOS 11 Simulator 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', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
444+
445+
'Apple iOS 11 Simulator Debug (Build)' : ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'archive-built-product', 'upload', 'archive-built-product', 'upload', 'transfer-to-s3', 'trigger'],
446+
'Apple iOS 11 Simulator 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', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
449447

450448
'JSCOnly Linux ARMv7 Thumb2 Release' : ['configure build', 'wait-for-svn-server', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],
451449
'JSCOnly Linux ARMv7 Traditional Release' : ['configure build', 'wait-for-svn-server', 'svn', 'delete WebKitBuild directory', 'delete stale build files', 'compile-webkit', 'jscore-test'],

‎Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BubbleQueueServer.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ BubbleQueueServer = function()
2929
"commit-queue": {platform: Dashboard.Platform.MacOSXElCapitan, shortName: "commit", title: "Commit Queue"},
3030
"style-queue": {shortName: "style", title: "Style Checker Queue"},
3131
"gtk-wk2-ews": {platform: Dashboard.Platform.LinuxGTK, shortName: "gtk-wk2", title: "WebKit2\xa0Release\xa0Build\xa0EWS"},
32-
"ios-ews": {platform: Dashboard.Platform.iOS10Device, shortName: "ios", title: "Release\xa0Build\xa0EWS"},
33-
"ios-sim-ews": {platform: Dashboard.Platform.iOS10Simulator, shortName: "ios-sim", title: "WebKit2\xa0Release\xa0Tests\xa0EWS"},
32+
"ios-ews": {platform: Dashboard.Platform.iOS11Device, shortName: "ios", title: "Release\xa0Build\xa0EWS"},
33+
"ios-sim-ews": {platform: Dashboard.Platform.iOS11Simulator, shortName: "ios-sim", title: "WebKit2\xa0Release\xa0Tests\xa0EWS"},
3434
"bindings-ews": {platform: Dashboard.Platform.MacOSXElCapitan, shortName: "bindings", title: "Bindings\xa0EWS"},
3535
"jsc-ews": {platform: Dashboard.Platform.MacOSXElCapitan, shortName: "jsc", title: "Release\xa0JSC\xa0Tests\xa0EWS"},
3636
"mac-ews": {platform: Dashboard.Platform.MacOSXElCapitan, shortName: "mac", title: "WebKit1\xa0Release\xa0Tests\xa0EWS"},

‎Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/Dashboard.js

-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ Dashboard = {
3030
MacOSXElCapitan: { name: "mac-os-x-elcapitan", readableName: "OS X El Capitan", order: 9 },
3131
iOS11Simulator: { name: "ios-simulator-11", readableName: "iOS 11 Simulator", order: 20 },
3232
iOS11Device: { name: "ios-11", readableName: "iOS 11", order: 25 },
33-
iOS10Simulator: { name: "ios-simulator-10", readableName: "iOS 10 Simulator", order: 30 },
34-
iOS10Device: { name: "ios-10", readableName: "iOS 10", order: 40 },
3533
Windows8: { name: "windows-8", readableName: "Windows 8", order: 50 },
3634
Windows7: { name: "windows-7", readableName: "Windows 7", order: 60 },
3735
WindowsXP: { name: "windows-xp", readableName: "Windows XP", order: 70 },

‎Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,11 @@ WebKitBuildbot = function()
5656
"Apple El Capitan Debug Test262 (Tests)": {heading: "Debug Test262 (Tests)"},
5757
"Apple El Capitan Release Test262 (Tests)": {heading: "Release Test262 (Tests)"},
5858
}},
59-
"Apple iOS 10 Release (Build)": {platform: Dashboard.Platform.iOS10Device, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.Universal},
60-
"Apple iOS 10 Simulator Release (Build)": {platform: Dashboard.Platform.iOS10Simulator, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
61-
"Apple iOS 10 Simulator Release WK1 (Tests)": {platform: Dashboard.Platform.iOS10Simulator, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
62-
"Apple iOS 10 Simulator Release WK2 (Tests)": {platform: Dashboard.Platform.iOS10Simulator, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
63-
"Apple iOS 10 Simulator Debug (Build)": {platform: Dashboard.Platform.iOS10Simulator, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
64-
"Apple iOS 10 Simulator Debug WK1 (Tests)": {platform: Dashboard.Platform.iOS10Simulator, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
65-
"Apple iOS 10 Simulator Debug WK2 (Tests)": {platform: Dashboard.Platform.iOS10Simulator, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
59+
"Apple iOS 11 Release (Build)": {platform: Dashboard.Platform.iOS11Device, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
60+
"Apple iOS 11 Simulator Release (Build)": {platform: Dashboard.Platform.iOS11Simulator, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
61+
"Apple iOS 11 Simulator Release WK2 (Tests)": {platform: Dashboard.Platform.iOS11Simulator, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
62+
"Apple iOS 11 Simulator Debug (Build)": {platform: Dashboard.Platform.iOS11Simulator, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
63+
"Apple iOS 11 Simulator Debug WK2 (Tests)": {platform: Dashboard.Platform.iOS11Simulator, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
6664
"Apple Win Debug (Build)": {platform: Dashboard.Platform.Windows7, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
6765
"Apple Win Release (Build)": {platform: Dashboard.Platform.Windows7, builder: true, architecture: Buildbot.BuildArchitecture.ThirtyTwoBit},
6866
"Apple Win 7 Debug (Tests)": {platform: Dashboard.Platform.Windows7, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},

0 commit comments

Comments
 (0)