Modified: trunk/Tools/CISupport/build-webkit-org/config.json (288743 => 288744)
--- trunk/Tools/CISupport/build-webkit-org/config.json 2022-01-28 17:29:26 UTC (rev 288743)
+++ trunk/Tools/CISupport/build-webkit-org/config.json 2022-01-28 17:37:43 UTC (rev 288744)
@@ -9,7 +9,6 @@
{ "name": "bot165", "platform": "mac-monterey" },
{ "name": "bot179", "platform": "mac-monterey" },
{ "name": "bot183", "platform": "mac-monterey" },
- { "name": "bot184", "platform": "mac-monterey" },
{ "name": "bot185", "platform": "mac-monterey" },
{ "name": "bot187", "platform": "mac-monterey" },
{ "name": "bot198", "platform": "mac-monterey" },
@@ -29,13 +28,17 @@
{ "name": "bot137", "platform": "mac-bigsur" },
{ "name": "bot140", "platform": "mac-bigsur" },
{ "name": "bot142", "platform": "mac-bigsur" },
+ { "name": "bot178", "platform": "mac-bigsur" },
+ { "name": "bot184", "platform": "mac-bigsur" },
+ { "name": "bot260", "platform": "mac-bigsur" },
{ "name": "bot302", "platform": "mac-bigsur" },
+ { "name": "bot610", "platform": "mac-bigsur" },
+ { "name": "bot638", "platform": "mac-bigsur" },
{ "name": "bot1020", "platform": "mac-bigsur" },
{ "name": "bot1022", "platform": "mac-bigsur" },
{ "name": "bot1024", "platform": "mac-bigsur" },
{ "name": "bot1027", "platform": "mac-bigsur" },
- { "name": "bot178", "platform": "mac-catalina" },
{ "name": "bot205", "platform": "mac-catalina" },
{ "name": "bot241", "platform": "mac-catalina" },
{ "name": "bot242", "platform": "mac-catalina" },
@@ -45,9 +48,6 @@
{ "name": "bot246", "platform": "mac-catalina" },
{ "name": "bot247", "platform": "mac-catalina" },
{ "name": "bot248", "platform": "mac-catalina" },
- { "name": "bot260", "platform": "mac-catalina" },
- { "name": "bot610", "platform": "mac-catalina" },
- { "name": "bot638", "platform": "mac-catalina" },
{ "name": "bot674", "platform": "mac-catalina" },
{ "name": "bot683", "platform": "mac-catalina" },
{ "name": "bot687", "platform": "mac-catalina" },
@@ -213,8 +213,8 @@
{ "name": "Apple-BigSur-Release-Build", "factory": "BuildFactory", "builddir": "bigsur-release",
"platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64", "arm64"],
"triggers": [
- "bigsur-release-tests-wk1", "bigsur-release-tests-wk2", "bigsur-release-applesilicon-tests-wk1", "bigsur-release-applesilicon-tests-wk2",
- "bigsur-release-tests-wk2-webgl-gpuprocess"
+ "bigsur-release-tests-jsc", "bigsur-release-perf-tests", "bigsur-release-tests-wk1", "bigsur-release-tests-wk2",
+ "bigsur-release-applesilicon-tests-wk1", "bigsur-release-applesilicon-tests-wk2", "bigsur-release-tests-wk2-webgl-gpuprocess"
],
"workernames": ["bot121", "bot124"]
},
@@ -246,8 +246,8 @@
{ "name": "Apple-BigSur-Debug-Build", "factory": "BuildFactory", "builddir": "bigsur-debug",
"platform": "mac-bigsur", "configuration": "debug", "architectures": ["x86_64", "arm64"],
"triggers": [
- "bigsur-debug-tests-wk1", "bigsur-debug-tests-wk2", "bigsur-debug-applesilicon-tests-wk1",
- "bigsur-debug-applesilicon-tests-wk2"
+ "bigsur-debug-tests-jsc", "bigsur-debug-tests-wk1", "bigsur-debug-tests-wk2", "bigsur-debug-applesilicon-tests-wk1",
+ "bigsur-debug-applesilicon-tests-wk2", "bigsur-debug-tests-wk2-gpuprocess"
],
"workernames": ["bot126", "bot131"]
},
@@ -271,9 +271,31 @@
"additionalArguments": ["--no-retry-failures"],
"workernames": ["bot142"]
},
+ { "name": "Apple-BigSur-Debug-JSC-Tests", "factory": "TestJSCFactory", "builddir": "bigsur-debug-tests-jsc",
+ "platform": "mac-bigsur", "configuration": "debug", "architectures": ["x86_64"],
+ "workernames": ["bot638"]
+ },
+ { "name": "Apple-BigSur-Release-JSC-Tests", "factory": "TestJSCFactory", "builddir": "bigsur-release-tests-jsc",
+ "platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64"],
+ "workernames": ["bot610"]
+ },
+ { "name": "Apple-BigSur-Debug-WK2-GPUProcess-Tests", "factory": "TestAllButJSCFactory", "builddir": "bigsur-debug-tests-wk2-gpuprocess",
+ "platform": "mac-bigsur", "configuration": "debug", "architectures": ["x86_64"],
+ "additionalArguments": ["--no-retry-failures", "--use-gpu-process"],
+ "workernames": ["bot260"]
+ },
+ { "name": "Apple-BigSur-LLINT-CLoop-BuildAndTest", "factory": "BuildAndTestLLINTCLoopFactory", "builddir": "bigsur-cloop-debug",
+ "platform": "mac-bigsur", "configuration": "debug", "architectures": ["x86_64"],
+ "workernames": ["bot178"]
+ },
+ {
+ "name": "Apple-BigSur-Release-WK2-Perf", "factory": "DownloadAndPerfTestFactory", "builddir": "bigsur-release-perf-tests",
+ "platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64"],
+ "workernames": ["bot184"]
+ },
{ "name": "Apple-Catalina-Debug-Build", "factory": "BuildFactory", "builddir": "catalina-debug",
"platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
- "triggers": ["catalina-debug-tests-jsc", "catalina-debug-tests-wk1", "catalina-debug-tests-wk2", "catalina-debug-tests-wk2-gpuprocess"],
+ "triggers": ["catalina-debug-tests-wk1", "catalina-debug-tests-wk2"],
"workernames": ["bot687", "bot688"]
},
{ "name": "Apple-Catalina-Debug-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "catalina-debug-tests-wk1",
@@ -286,14 +308,9 @@
"additionalArguments": ["--no-retry-failures"],
"workernames": ["bot243", "bot244"]
},
- { "name": "Apple-Catalina-Debug-WK2-GPUProcess-Tests", "factory": "TestAllButJSCFactory", "builddir": "catalina-debug-tests-wk2-gpuprocess",
- "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
- "additionalArguments": ["--no-retry-failures", "--use-gpu-process"],
- "workernames": ["bot260"]
- },
{ "name": "Apple-Catalina-Release-Build", "factory": "BuildFactory", "builddir": "catalina-release",
"platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
- "triggers": ["catalina-release-tests-jsc", "catalina-release-perf-tests", "catalina-release-tests-wk1", "catalina-release-tests-wk2"],
+ "triggers": ["catalina-release-tests-wk1", "catalina-release-tests-wk2"],
"workernames": ["bot683", "bot674"]
},
{ "name": "Apple-Catalina-Release-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "catalina-release-tests-wk1",
@@ -306,24 +323,7 @@
"additionalArguments": ["--no-retry-failures"],
"workernames": ["bot247", "bot248"]
},
- { "name": "Apple-Catalina-Debug-JSC-Tests", "factory": "TestJSCFactory", "builddir": "catalina-debug-tests-jsc",
- "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
- "workernames": ["bot638"]
- },
- { "name": "Apple-Catalina-Release-JSC-Tests", "factory": "TestJSCFactory", "builddir": "catalina-release-tests-jsc",
- "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
- "workernames": ["bot610"]
- },
- { "name": "Apple-Catalina-LLINT-CLoop-BuildAndTest", "factory": "BuildAndTestLLINTCLoopFactory", "builddir": "catalina-cloop-debug",
- "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
- "workernames": ["bot178"]
- },
{
- "name": "Apple-Catalina-Release-WK2-Perf", "factory": "DownloadAndPerfTestFactory", "builddir": "catalina-release-perf-tests",
- "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
- "workernames": ["bot205"]
- },
- {
"name": "Apple-iOS-15-Release-Build", "factory": "BuildFactory", "builddir": "ios-15-release",
"platform": "ios-15", "configuration": "release", "architectures": ["arm64"],
"workernames": ["bot673"]
@@ -684,8 +684,14 @@
"builderNames": ["Apple-Monterey-AppleSilicon-Release-JSC-Tests"]
},
{ "type": "PlatformSpecificScheduler", "platform": "mac-bigsur", "branch": "trunk", "treeStableTimer": 45.0,
- "builderNames": ["Apple-BigSur-Release-Build", "Apple-BigSur-Debug-Build"]
+ "builderNames": ["Apple-BigSur-Release-Build", "Apple-BigSur-Debug-Build", "Apple-BigSur-LLINT-CLoop-BuildAndTest"]
},
+ { "type": "Triggerable", "name": "bigsur-release-tests-jsc",
+ "builderNames": ["Apple-BigSur-Release-JSC-Tests"]
+ },
+ { "type": "Triggerable", "name": "bigsur-release-perf-tests",
+ "builderNames": ["Apple-BigSur-Release-WK2-Perf"]
+ },
{ "type": "Triggerable", "name": "bigsur-release-tests-wk1",
"builderNames": ["Apple-BigSur-Release-WK1-Tests"]
},
@@ -701,6 +707,9 @@
{ "type": "Triggerable", "name": "bigsur-release-tests-wk2-webgl-gpuprocess",
"builderNames": ["Apple-BigSur-Release-WK2-WebGL-GPUProcess-Tests"]
},
+ { "type": "Triggerable", "name": "bigsur-debug-tests-jsc",
+ "builderNames": ["Apple-BigSur-Debug-JSC-Tests"]
+ },
{ "type": "Triggerable", "name": "bigsur-debug-tests-wk1",
"builderNames": ["Apple-BigSur-Debug-WK1-Tests"]
},
@@ -713,12 +722,12 @@
{ "type": "Triggerable", "name": "bigsur-debug-applesilicon-tests-wk2",
"builderNames": ["Apple-BigSur-Debug-AppleSilicon-WK2-Tests"]
},
+ { "type": "Triggerable", "name": "bigsur-debug-tests-wk2-gpuprocess",
+ "builderNames": ["Apple-BigSur-Debug-WK2-GPUProcess-Tests"]
+ },
{ "type": "PlatformSpecificScheduler", "platform": "mac-catalina", "branch": "trunk", "treeStableTimer": 45.0,
- "builderNames": ["Apple-Catalina-Release-Build", "Apple-Catalina-Debug-Build", "Apple-Catalina-LLINT-CLoop-BuildAndTest"]
+ "builderNames": ["Apple-Catalina-Release-Build", "Apple-Catalina-Debug-Build"]
},
- { "type": "Triggerable", "name": "catalina-release-perf-tests",
- "builderNames": ["Apple-Catalina-Release-WK2-Perf"]
- },
{ "type": "Triggerable", "name": "catalina-release-tests-wk1",
"builderNames": ["Apple-Catalina-Release-WK1-Tests"]
},
@@ -731,15 +740,6 @@
{ "type": "Triggerable", "name": "catalina-debug-tests-wk2",
"builderNames": ["Apple-Catalina-Debug-WK2-Tests"]
},
- { "type": "Triggerable", "name": "catalina-debug-tests-wk2-gpuprocess",
- "builderNames": ["Apple-Catalina-Debug-WK2-GPUProcess-Tests"]
- },
- { "type": "Triggerable", "name": "catalina-debug-tests-jsc",
- "builderNames": ["Apple-Catalina-Debug-JSC-Tests"]
- },
- { "type": "Triggerable", "name": "catalina-release-tests-jsc",
- "builderNames": ["Apple-Catalina-Release-JSC-Tests"]
- },
{ "type": "PlatformSpecificScheduler", "platform": "ios-15", "branch": "trunk", "treeStableTimer": 45.0,
"builderNames": ["Apple-iOS-15-Release-Build"]
},
Modified: trunk/Tools/CISupport/build-webkit-org/factories_unittest.py (288743 => 288744)
--- trunk/Tools/CISupport/build-webkit-org/factories_unittest.py 2022-01-28 17:29:26 UTC (rev 288743)
+++ trunk/Tools/CISupport/build-webkit-org/factories_unittest.py 2022-01-28 17:37:43 UTC (rev 288744)
@@ -461,6 +461,41 @@
'builtins-generator-tests',
'trigger-crash-log-submission'
],
+ 'Apple-BigSur-Release-JSC-Tests': [
+ 'configure-build',
+ 'configuration',
+ 'clean-and-update-working-directory',
+ 'show-identifier',
+ 'kill-old-processes',
+ 'delete-WebKitBuild-directory',
+ 'delete-stale-build-files',
+ 'download-built-product',
+ 'extract-built-product',
+ 'jscore-test'
+ ],
+ 'Apple-BigSur-LLINT-CLoop-BuildAndTest': [
+ 'configure-build',
+ 'configuration',
+ 'clean-and-update-working-directory',
+ 'show-identifier',
+ 'kill-old-processes',
+ 'delete-WebKitBuild-directory',
+ 'delete-stale-build-files',
+ 'compile-webkit',
+ 'webkit-jsc-cloop-test'
+ ],
+ 'Apple-BigSur-Release-WK2-Perf': [
+ 'configure-build',
+ 'configuration',
+ 'clean-and-update-working-directory',
+ 'show-identifier',
+ 'kill-old-processes',
+ 'delete-WebKitBuild-directory',
+ 'delete-stale-build-files',
+ 'download-built-product',
+ 'extract-built-product',
+ 'perf-test'
+ ],
'Apple-BigSur-Debug-Build': [
'configure-build',
'configuration',
@@ -577,7 +612,7 @@
'builtins-generator-tests',
'trigger-crash-log-submission'
],
- 'Apple-Catalina-Debug-Build': [
+ 'Apple-BigSur-Debug-JSC-Tests': [
'configure-build',
'configuration',
'clean-and-update-working-directory',
@@ -585,15 +620,11 @@
'kill-old-processes',
'delete-WebKitBuild-directory',
'delete-stale-build-files',
- 'compile-webkit',
- 'archive-built-product',
- 'upload',
- 'archive-built-product',
- 'upload',
- 'transfer-to-s3',
- 'trigger'
+ 'download-built-product',
+ 'extract-built-product',
+ 'jscore-test'
],
- 'Apple-Catalina-Debug-WK1-Tests': [
+ 'Apple-BigSur-Debug-WK2-GPUProcess-Tests': [
'configure-build',
'configuration',
'clean-and-update-working-directory',
@@ -611,6 +642,7 @@
'extract-test-results',
'set-permissions',
'run-api-tests',
+ 'lldb-webkit-test',
'webkitpy-test',
'webkitperl-test',
'bindings-generation-tests',
@@ -617,7 +649,7 @@
'builtins-generator-tests',
'trigger-crash-log-submission'
],
- 'Apple-Catalina-Debug-WK2-Tests': [
+ 'Apple-Catalina-Debug-Build': [
'configure-build',
'configuration',
'clean-and-update-working-directory',
@@ -625,6 +657,22 @@
'kill-old-processes',
'delete-WebKitBuild-directory',
'delete-stale-build-files',
+ 'compile-webkit',
+ 'archive-built-product',
+ 'upload',
+ 'archive-built-product',
+ 'upload',
+ 'transfer-to-s3',
+ 'trigger'
+ ],
+ 'Apple-Catalina-Debug-WK1-Tests': [
+ 'configure-build',
+ 'configuration',
+ 'clean-and-update-working-directory',
+ 'show-identifier',
+ 'kill-old-processes',
+ 'delete-WebKitBuild-directory',
+ 'delete-stale-build-files',
'download-built-product',
'extract-built-product',
'wait-for-crash-collection',
@@ -641,7 +689,7 @@
'builtins-generator-tests',
'trigger-crash-log-submission'
],
- 'Apple-Catalina-Debug-WK2-GPUProcess-Tests': [
+ 'Apple-Catalina-Debug-WK2-Tests': [
'configure-build',
'configuration',
'clean-and-update-working-directory',
@@ -729,53 +777,6 @@
'builtins-generator-tests',
'trigger-crash-log-submission'
],
- 'Apple-Catalina-Debug-JSC-Tests': [
- 'configure-build',
- 'configuration',
- 'clean-and-update-working-directory',
- 'show-identifier',
- 'kill-old-processes',
- 'delete-WebKitBuild-directory',
- 'delete-stale-build-files',
- 'download-built-product',
- 'extract-built-product',
- 'jscore-test'
- ],
- 'Apple-Catalina-Release-JSC-Tests': [
- 'configure-build',
- 'configuration',
- 'clean-and-update-working-directory',
- 'show-identifier',
- 'kill-old-processes',
- 'delete-WebKitBuild-directory',
- 'delete-stale-build-files',
- 'download-built-product',
- 'extract-built-product',
- 'jscore-test'
- ],
- 'Apple-Catalina-LLINT-CLoop-BuildAndTest': [
- 'configure-build',
- 'configuration',
- 'clean-and-update-working-directory',
- 'show-identifier',
- 'kill-old-processes',
- 'delete-WebKitBuild-directory',
- 'delete-stale-build-files',
- 'compile-webkit',
- 'webkit-jsc-cloop-test'
- ],
- 'Apple-Catalina-Release-WK2-Perf': [
- 'configure-build',
- 'configuration',
- 'clean-and-update-working-directory',
- 'show-identifier',
- 'kill-old-processes',
- 'delete-WebKitBuild-directory',
- 'delete-stale-build-files',
- 'download-built-product',
- 'extract-built-product',
- 'perf-test'
- ],
'Apple-iOS-15-Release-Build': [
'configure-build',
'configuration',
Modified: trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js (288743 => 288744)
--- trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js 2022-01-28 17:29:26 UTC (rev 288743)
+++ trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js 2022-01-28 17:37:43 UTC (rev 288744)
@@ -53,6 +53,11 @@
"Apple-BigSur-Debug-AppleSilicon-WK2-Tests": {platform: Dashboard.Platform.macOSBigSur, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2, heading: "Debug AppleSilicon"},
"Apple-BigSur-Release-AppleSilicon-WK1-Tests": {platform: Dashboard.Platform.macOSBigSur, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1, heading: "Release AppleSilicon"},
"Apple-BigSur-Release-AppleSilicon-WK2-Tests": {platform: Dashboard.Platform.macOSBigSur, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2, heading: "Release AppleSilicon"},
+ "Apple-BigSur JSC": {platform: Dashboard.Platform.macOSBigSur, heading: "_javascript_", combinedQueues: {
+ "Apple-BigSur-LLINT-CLoop-BuildAndTest": {heading: "LLINT CLoop (BuildAndTest)"},
+ "Apple-BigSur-Debug-JSC-Tests": {heading: "Debug JSC (Tests)"},
+ "Apple-BigSur-Release-JSC-Tests": {heading: "Release JSC (Tests)"},
+ }},
"Apple-Catalina-Debug-Build": {platform: Dashboard.Platform.macOSCatalina, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
"Apple-Catalina-Release-Build": {platform: Dashboard.Platform.macOSCatalina, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
"Apple-Catalina-Debug-WK1-Tests": {platform: Dashboard.Platform.macOSCatalina, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
@@ -60,11 +65,6 @@
"Apple-Catalina-Release-WK1-Tests": {platform: Dashboard.Platform.macOSCatalina, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
"Apple-Catalina-Release-WK2-Perf": {platform: Dashboard.Platform.macOSCatalina, debug: false, performance: true, heading: "Performance"},
"Apple-Catalina-Release-WK2-Tests": {platform: Dashboard.Platform.macOSCatalina, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
- "Apple-Catalina JSC": {platform: Dashboard.Platform.macOSCatalina, heading: "_javascript_", combinedQueues: {
- "Apple-Catalina-LLINT-CLoop-BuildAndTest": {heading: "LLINT CLoop (BuildAndTest)"},
- "Apple-Catalina-Debug-JSC-Tests": {heading: "Debug JSC (Tests)"},
- "Apple-Catalina-Release-JSC-Tests": {heading: "Release JSC (Tests)"},
- }},
"Apple-iOS-15-Release-Build": {platform: Dashboard.Platform.iOS15Device, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
"Apple-iOS-15-Simulator-Release-Build": {platform: Dashboard.Platform.iOS15Simulator, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
"Apple-iOS-15-Simulator-Release-WK2-Tests": {platform: Dashboard.Platform.iOS15Simulator, heading:"iOS Release", debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
