Skip to content

Commit d479ffe

Browse files
author
[email protected]
committed
Add High Sierra bots to buildbot and dashboard.
https://bugs.webkit.org/show_bug.cgi?id=177437 Reviewed by Alexey Proskuryakov. * BuildSlaveSupport/build.webkit.org-config/config.json: Add High Sierra queues, move Leaks and JSC queues over from Sierra. * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py: Update expected results. * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js: Add High Sierra. (WebKitBuildbot): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@222469 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 67ebd3d commit d479ffe

File tree

4 files changed

+141
-56
lines changed

4 files changed

+141
-56
lines changed

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

+102-44
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,30 @@
2323
{ "name": "bot433", "platform": "mac-elcapitan" },
2424
{ "name": "bot434", "platform": "mac-elcapitan" },
2525

26+
{ "name": "bot121", "platform": "mac-highsierra" },
27+
{ "name": "bot155", "platform": "mac-highsierra" },
28+
{ "name": "bot153", "platform": "mac-highsierra" },
29+
{ "name": "bot157", "platform": "mac-highsierra" },
30+
{ "name": "bot163", "platform": "mac-highsierra" },
31+
{ "name": "bot182", "platform": "mac-highsierra" },
32+
{ "name": "bot186", "platform": "mac-highsierra" },
33+
{ "name": "bot187", "platform": "mac-highsierra" },
34+
{ "name": "bot194", "platform": "mac-highsierra" },
35+
{ "name": "bot197", "platform": "mac-highsierra" },
36+
{ "name": "bot215", "platform": "mac-highsierra" },
37+
{ "name": "bot216", "platform": "mac-highsierra" },
38+
{ "name": "bot217", "platform": "mac-highsierra" },
39+
{ "name": "bot630", "platform": "mac-highsierra" },
40+
{ "name": "bot631", "platform": "mac-highsierra" },
41+
{ "name": "bot635", "platform": "mac-highsierra" },
42+
{ "name": "bot636", "platform": "mac-highsierra" },
43+
{ "name": "bot638", "platform": "mac-highsierra" },
44+
2645
{ "name": "bot118", "platform": "mac-sierra" },
27-
{ "name": "bot121", "platform": "mac-sierra" },
2846
{ "name": "bot122", "platform": "mac-sierra" },
2947
{ "name": "bot141", "platform": "mac-sierra" },
30-
{ "name": "bot155", "platform": "mac-sierra" },
31-
{ "name": "bot157", "platform": "mac-sierra" },
3248
{ "name": "bot160", "platform": "mac-sierra" },
3349
{ "name": "bot164", "platform": "mac-sierra" },
34-
{ "name": "bot186", "platform": "mac-sierra" },
35-
{ "name": "bot187", "platform": "mac-sierra" },
3650
{ "name": "bot199", "platform": "mac-sierra" },
3751
{ "name": "bot202", "platform": "mac-sierra" },
3852
{ "name": "bot219", "platform": "mac-sierra" },
@@ -43,14 +57,10 @@
4357
{ "name": "bot699", "platform": "mac-sierra" },
4458

4559
{ "name": "bot673", "platform": "ios-11" },
46-
{ "name": "bot197", "platform": "ios-simulator-11" },
4760
{ "name": "bot626", "platform": "ios-simulator-11" },
4861
{ "name": "bot618", "platform": "ios-simulator-11" },
4962
{ "name": "bot620", "platform": "ios-simulator-11" },
5063
{ "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" },
5464
{ "name": "bot651", "platform": "ios-simulator-11" },
5565
{ "name": "bot652", "platform": "ios-simulator-11" },
5666
{ "name": "bot653", "platform": "ios-simulator-11" },
@@ -85,9 +95,64 @@
8595
{ "name": "wpe-linux-bot-2", "platform": "wpe" }
8696
],
8797

88-
"builders": [ { "name": "Apple Sierra Debug (Build)", "type": "Build", "builddir": "sierra-debug",
98+
"builders": [ { "name": "Apple High Sierra Debug (Build)", "type": "Build", "builddir": "highsierra-debug",
99+
"platform": "mac-highsierra", "configuration": "debug", "architectures": ["x86_64"],
100+
"triggers": ["highsierra-debug-tests-jsc", "highsierra-debug-tests-wk1", "highsierra-debug-tests-wk2"],
101+
"slavenames": ["bot630", "bot631"]
102+
},
103+
{ "name": "Apple High Sierra Debug WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "highsierra-debug-tests-wk1",
104+
"platform": "mac-highsierra", "configuration": "debug", "architectures": ["x86_64"],
105+
"additionalArguments": ["--no-retry-failures"],
106+
"slavenames": ["bot153", "bot163"]
107+
},
108+
{ "name": "Apple High Sierra Debug WK2 (Tests)", "type": "TestAllButJSC", "builddir": "highsierra-debug-tests-wk2",
109+
"platform": "mac-highsierra", "configuration": "debug", "architectures": ["x86_64"],
110+
"additionalArguments": ["--no-retry-failures"],
111+
"slavenames": ["bot182", "bot194"]
112+
},
113+
{ "name": "Apple High Sierra Release (Build)", "type": "Build", "builddir": "highsierra-release",
114+
"platform": "mac-highsierra", "configuration": "release", "architectures": ["x86_64"],
115+
"triggers": ["highsierra-release-tests-jsc", "highsierra-release-tests-wk1", "highsierra-release-tests-wk2", "highsierra-leaks"],
116+
"slavenames": ["bot635", "bot636"]
117+
},
118+
{ "name": "Apple High Sierra Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "highsierra-release-tests-wk1",
119+
"platform": "mac-highsierra", "configuration": "release", "architectures": ["x86_64"],
120+
"additionalArguments": ["--no-retry-failures"],
121+
"slavenames": ["bot197", "bot215"]
122+
},
123+
{ "name": "Apple High Sierra Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "highsierra-release-tests-wk2",
124+
"platform": "mac-highsierra", "configuration": "release", "architectures": ["x86_64"],
125+
"additionalArguments": ["--no-retry-failures"],
126+
"slavenames": ["bot216", "bot217"]
127+
},
128+
{ "name": "Apple High Sierra Release (32-bit Build)", "type": "Build", "builddir": "highsierra-32bit-release",
129+
"platform": "mac-highsierra", "configuration": "release", "architectures": ["i386"],
130+
"slavenames": ["bot638"]
131+
},
132+
{ "name": "Apple High Sierra Debug JSC (Tests)", "type": "TestJSC", "builddir": "highsierra-debug-tests-jsc",
133+
"platform": "mac-highsierra", "configuration": "debug", "architectures": ["x86_64"],
134+
"slavenames": ["bot155"]
135+
},
136+
{ "name": "Apple High Sierra Release JSC (Tests)", "type": "TestJSC", "builddir": "highsierra-release-tests-jsc",
137+
"platform": "mac-highsierra", "configuration": "release", "architectures": ["x86_64"],
138+
"slavenames": ["bot157"]
139+
},
140+
{ "name": "Apple High Sierra LLINT CLoop (BuildAndTest)", "type": "BuildAndTestLLINTCLoop", "builddir": "highsierra-cloop-debug",
141+
"platform": "mac-highsierra", "configuration": "debug", "architectures": ["x86_64"],
142+
"slavenames": ["bot186"]
143+
},
144+
{ "name": "Apple High Sierra 32-bit JSC (BuildAndTest)", "type": "BuildAndTest32bitJSC", "builddir": "highsierra-32bitJSC-debug",
145+
"platform": "mac-highsierra", "configuration": "debug", "architectures": ["i386"],
146+
"slavenames": ["bot187"]
147+
},
148+
{ "name": "Apple High Sierra (Leaks)", "type": "TestWebKit1Leaks", "builddir": "highsierra-leaks",
149+
"platform": "mac-highsierra", "configuration": "release", "architectures": ["x86_64"],
150+
"additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
151+
"slavenames": ["bot121"]
152+
},
153+
{ "name": "Apple Sierra Debug (Build)", "type": "Build", "builddir": "sierra-debug",
89154
"platform": "mac-sierra", "configuration": "debug", "architectures": ["x86_64"],
90-
"triggers": ["sierra-debug-tests-jsc", "sierra-debug-tests-wk1", "sierra-debug-tests-wk2"],
155+
"triggers": ["sierra-debug-tests-wk1", "sierra-debug-tests-wk2"],
91156
"slavenames": ["bot439", "bot698"]
92157
},
93158
{ "name": "Apple Sierra Debug WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "sierra-debug-tests-wk1",
@@ -102,7 +167,7 @@
102167
},
103168
{ "name": "Apple Sierra Release (Build)", "type": "Build", "builddir": "sierra-release",
104169
"platform": "mac-sierra", "configuration": "release", "architectures": ["x86_64"],
105-
"triggers": ["sierra-release-tests-jsc", "sierra-release-tests-wk1", "sierra-release-tests-wk2", "sierra-leaks"],
170+
"triggers": ["sierra-release-tests-wk1", "sierra-release-tests-wk2"],
106171
"slavenames": ["bot443", "bot699"]
107172
},
108173
{ "name": "Apple Sierra Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "sierra-release-tests-wk1",
@@ -119,27 +184,6 @@
119184
"platform": "mac-sierra", "configuration": "release", "architectures": ["i386"],
120185
"slavenames": ["bot600"]
121186
},
122-
{ "name": "Apple Sierra Debug JSC (Tests)", "type": "TestJSC", "builddir": "sierra-debug-tests-jsc",
123-
"platform": "mac-sierra", "configuration": "debug", "architectures": ["x86_64"],
124-
"slavenames": ["bot155"]
125-
},
126-
{ "name": "Apple Sierra Release JSC (Tests)", "type": "TestJSC", "builddir": "sierra-release-tests-jsc",
127-
"platform": "mac-sierra", "configuration": "release", "architectures": ["x86_64"],
128-
"slavenames": ["bot157"]
129-
},
130-
{ "name": "Apple Sierra LLINT CLoop (BuildAndTest)", "type": "BuildAndTestLLINTCLoop", "builddir": "sierra-cloop-debug",
131-
"platform": "mac-sierra", "configuration": "debug", "architectures": ["x86_64"],
132-
"slavenames": ["bot186"]
133-
},
134-
{ "name": "Apple Sierra 32-bit JSC (BuildAndTest)", "type": "BuildAndTest32bitJSC", "builddir": "sierra-32bitJSC-debug",
135-
"platform": "mac-sierra", "configuration": "debug", "architectures": ["i386"],
136-
"slavenames": ["bot187"]
137-
},
138-
{ "name": "Apple Sierra (Leaks)", "type": "TestWebKit1Leaks", "builddir": "sierra-leaks",
139-
"platform": "mac-sierra", "configuration": "release", "architectures": ["x86_64"],
140-
"additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
141-
"slavenames": ["bot121"]
142-
},
143187
{ "name": "Apple El Capitan Debug (Build)", "type": "Build", "builddir": "elcapitan-debug",
144188
"platform": "mac-elcapitan", "configuration": "debug", "architectures": ["x86_64"],
145189
"triggers": ["elcapitan-debug-tests-jsc", "elcapitan-debug-tests-test262", "elcapitan-debug-tests-wk1", "elcapitan-debug-tests-wk2"],
@@ -226,7 +270,6 @@
226270
"slavenames": ["bot626", "bot621"]
227271
},
228272
{
229-
230273
"name": "Apple iOS 11 Simulator Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-11-release-tests-wk2",
231274
"platform": "ios-simulator-11", "configuration": "release", "architectures": ["x86_64"],
232275
"additionalArguments": ["--no-retry-failures"],
@@ -361,8 +404,11 @@
361404
{ "type": "PlatformSpecificScheduler", "platform": "mac-elcapitan", "branch": "trunk", "treeStableTimer": 45.0,
362405
"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)"]
363406
},
407+
{ "type": "PlatformSpecificScheduler", "platform": "mac-highsierra", "branch": "trunk", "treeStableTimer": 45.0,
408+
"builderNames": ["Apple High Sierra Release (Build)", "Apple High Sierra Debug (Build)", "Apple High Sierra Release (32-bit Build)", "Apple High Sierra LLINT CLoop (BuildAndTest)", "Apple High Sierra 32-bit JSC (BuildAndTest)"]
409+
},
364410
{ "type": "PlatformSpecificScheduler", "platform": "mac-sierra", "branch": "trunk", "treeStableTimer": 45.0,
365-
"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)"]
411+
"builderNames": ["Apple Sierra Release (Build)", "Apple Sierra Debug (Build)", "Apple Sierra Release (32-bit Build)"]
366412
},
367413
{ "type": "PlatformSpecificScheduler", "platform": "ios-11", "branch": "trunk", "treeStableTimer": 45.0,
368414
"builderNames": ["Apple iOS 11 Release (Build)"]
@@ -373,6 +419,27 @@
373419
{ "type": "PlatformSpecificScheduler", "platform": "win", "branch": "trunk", "treeStableTimer": 45.0,
374420
"builderNames": ["Apple Win Release (Build)", "Apple Win Debug (Build)"]
375421
},
422+
{ "type": "Triggerable", "name": "highsierra-release-tests-wk1",
423+
"builderNames": ["Apple High Sierra Release WK1 (Tests)"]
424+
},
425+
{ "type": "Triggerable", "name": "highsierra-release-tests-wk2",
426+
"builderNames": ["Apple High Sierra Release WK2 (Tests)"]
427+
},
428+
{ "type": "Triggerable", "name": "highsierra-debug-tests-wk1",
429+
"builderNames": ["Apple High Sierra Debug WK1 (Tests)"]
430+
},
431+
{ "type": "Triggerable", "name": "highsierra-debug-tests-wk2",
432+
"builderNames": ["Apple High Sierra Debug WK2 (Tests)"]
433+
},
434+
{ "type": "Triggerable", "name": "highsierra-debug-tests-jsc",
435+
"builderNames": ["Apple High Sierra Debug JSC (Tests)"]
436+
},
437+
{ "type": "Triggerable", "name": "highsierra-release-tests-jsc",
438+
"builderNames": ["Apple High Sierra Release JSC (Tests)"]
439+
},
440+
{ "type": "Triggerable", "name": "highsierra-leaks",
441+
"builderNames": ["Apple High Sierra (Leaks)"]
442+
},
376443
{ "type": "Triggerable", "name": "sierra-release-tests-wk1",
377444
"builderNames": ["Apple Sierra Release WK1 (Tests)"]
378445
},
@@ -385,15 +452,6 @@
385452
{ "type": "Triggerable", "name": "sierra-debug-tests-wk2",
386453
"builderNames": ["Apple Sierra Debug WK2 (Tests)"]
387454
},
388-
{ "type": "Triggerable", "name": "sierra-debug-tests-jsc",
389-
"builderNames": ["Apple Sierra Debug JSC (Tests)"]
390-
},
391-
{ "type": "Triggerable", "name": "sierra-release-tests-jsc",
392-
"builderNames": ["Apple Sierra Release JSC (Tests)"]
393-
},
394-
{ "type": "Triggerable", "name": "sierra-leaks",
395-
"builderNames": ["Apple Sierra (Leaks)"]
396-
},
397455
{ "type": "Triggerable", "name": "elcapitan-release-tests-jsc",
398456
"builderNames": ["Apple El Capitan Release JSC (Tests)"]
399457
},

0 commit comments

Comments
 (0)