[webkit-changes] [284799] trunk/Tools

Mon, 25 Oct 2021 11:13:12 -0700

Title: [284799] trunk/Tools
Revision
284799
Author
[email protected]
Date
2021-10-25 11:06:47 -0700 (Mon, 25 Oct 2021)

Log Message

Bring up queues for Monterey
https://bugs.webkit.org/show_bug.cgi?id=232186

Reviewed by Alexey Proskuryakov.

* CISupport/build-webkit-org/config.json:
* CISupport/build-webkit-org/factories_unittest.py:
(TestExpectedBuildSteps):
* CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js:
(WebKitBuildbot):
* CISupport/build-webkit-org/wkbuild.py:
(_should_file_trigger_build):

Modified Paths

Diff

Modified: trunk/Tools/CISupport/build-webkit-org/config.json (284798 => 284799)


--- trunk/Tools/CISupport/build-webkit-org/config.json	2021-10-25 18:04:45 UTC (rev 284798)
+++ trunk/Tools/CISupport/build-webkit-org/config.json	2021-10-25 18:06:47 UTC (rev 284799)
@@ -1,30 +1,38 @@
 {
     "workers":     [
-                    { "name": "bot105", "platform": "mac-bigsur" },
-                    { "name": "bot111", "platform": "mac-bigsur" },
+                    { "name": "bot105", "platform": "mac-monterey" },
+                    { "name": "bot111", "platform": "mac-monterey" },
+                    { "name": "bot135", "platform": "mac-monterey" },
+                    { "name": "bot138", "platform": "mac-monterey" },
+                    { "name": "bot139", "platform": "mac-monterey" },
+                    { "name": "bot141", "platform": "mac-monterey" },
+                    { "name": "bot165", "platform": "mac-monterey" },
+                    { "name": "bot179", "platform": "mac-monterey" },
+                    { "name": "bot183", "platform": "mac-monterey" },
+                    { "name": "bot184", "platform": "mac-monterey" },
+                    { "name": "bot186", "platform": "mac-monterey" },
+                    { "name": "bot187", "platform": "mac-monterey" },
+                    { "name": "bot198", "platform": "mac-monterey" },
+                    { "name": "bot279", "platform": "mac-monterey" },
+                    { "name": "bot603", "platform": "mac-monterey" },
+                    { "name": "bot632", "platform": "mac-monterey" },
+                    { "name": "bot1021", "platform": "mac-monterey" },
+                    { "name": "bot1023", "platform": "mac-monterey" },
+                    { "name": "bot1025", "platform": "mac-monterey" },
+                    { "name": "bot1026", "platform": "mac-monterey" },
+
                     { "name": "bot121", "platform": "mac-bigsur" },
                     { "name": "bot124", "platform": "mac-bigsur" },
                     { "name": "bot126", "platform": "mac-bigsur" },
                     { "name": "bot131", "platform": "mac-bigsur" },
                     { "name": "bot132", "platform": "mac-bigsur" },
-                    { "name": "bot135", "platform": "mac-bigsur" },
                     { "name": "bot137", "platform": "mac-bigsur" },
-                    { "name": "bot138", "platform": "mac-bigsur" },
-                    { "name": "bot139", "platform": "mac-bigsur" },
                     { "name": "bot140", "platform": "mac-bigsur" },
-                    { "name": "bot141", "platform": "mac-bigsur" },
                     { "name": "bot142", "platform": "mac-bigsur" },
-                    { "name": "bot165", "platform": "mac-bigsur" },
                     { "name": "bot302", "platform": "mac-bigsur" },
-                    { "name": "bot603", "platform": "mac-bigsur" },
-                    { "name": "bot632", "platform": "mac-bigsur" },
                     { "name": "bot1020", "platform": "mac-bigsur" },
-                    { "name": "bot1021", "platform": "mac-bigsur" },
                     { "name": "bot1022", "platform": "mac-bigsur" },
-                    { "name": "bot1023", "platform": "mac-bigsur" },
                     { "name": "bot1024", "platform": "mac-bigsur" },
-                    { "name": "bot1025", "platform": "mac-bigsur" },
-                    { "name": "bot1026", "platform": "mac-bigsur" },
                     { "name": "bot1027", "platform": "mac-bigsur" },
 
                     { "name": "bot178", "platform": "mac-catalina" },
@@ -45,12 +53,7 @@
                     { "name": "bot687", "platform": "mac-catalina" },
                     { "name": "bot688", "platform": "mac-catalina" },
 
-                    { "name": "bot187", "platform": "*" },
-                    { "name": "bot179", "platform": "*" },
-                    { "name": "bot183", "platform": "*" },
-                    { "name": "bot184", "platform": "*" },
                     { "name": "bot185", "platform": "*" },
-                    { "name": "bot198", "platform": "*" },
                     { "name": "bot611", "platform": "*" },
                     { "name": "bot612", "platform": "*" },
                     { "name": "bot613", "platform": "*" },
@@ -132,41 +135,109 @@
                   ],
 
     "builders":   [
-                    { "name": "Apple-BigSur-Release-Build", "factory": "BuildFactory", "builddir": "bigsur-release",
-                      "platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64", "arm64"],
+                    { "name": "Apple-Monterey-Release-Build", "factory": "BuildFactory", "builddir": "monterey-release",
+                      "platform": "mac-monterey", "configuration": "release", "architectures": ["x86_64", "arm64"],
                       "triggers": [
-                          "bigsur-applesilicon-release-tests-test262" ,"bigsur-release-tests-test262", "bigsur-release-tests-wk1", "bigsur-release-tests-wk2",
-                          "bigsur-release-applesilicon-tests-wk1", "bigsur-release-applesilicon-tests-wk2", "bigsur-applesilicon-release-tests-jsc", "bigsur-release-tests-wk2-webgl-gpuprocess"
+                          "monterey-applesilicon-release-tests-test262" ,"monterey-release-tests-test262", "monterey-release-tests-wk1", "monterey-release-tests-wk2",
+                          "monterey-release-applesilicon-tests-wk1", "monterey-release-applesilicon-tests-wk2", "monterey-applesilicon-release-tests-jsc"
                       ],
-                      "workernames": ["bot121", "bot124"]
+                      "workernames": ["bot186", "bot187"]
                     },
-                    { "name": "Apple-BigSur-AppleSilicon-Release-Test262-Tests", "factory": "Test262Factory", "builddir": "bigsur-applesilicon-release-tests-test262",
-                      "platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64", "arm64"],
+                    { "name": "Apple-Monterey-AppleSilicon-Release-Test262-Tests", "factory": "Test262Factory", "builddir": "monterey-applesilicon-release-tests-test262",
+                      "platform": "mac-monterey", "configuration": "release", "architectures": ["x86_64", "arm64"],
                       "workernames": ["bot165"]
                     },
-                    { "name": "Apple-BigSur-Release-Test262-Tests", "factory": "Test262Factory", "builddir": "bigsur-release-tests-test262",
-                      "platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64", "arm64"],
+                    { "name": "Apple-Monterey-Release-Test262-Tests", "factory": "Test262Factory", "builddir": "monterey-release-tests-test262",
+                      "platform": "mac-monterey", "configuration": "release", "architectures": ["x86_64", "arm64"],
                       "workernames": ["bot632"]
                     },
+                    { "name": "Apple-Monterey-Release-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "monterey-release-tests-wk1",
+                      "platform": "mac-monterey", "configuration": "release", "architectures": ["x86_64", "arm64"],
+                      "additionalArguments": ["--no-retry-failures"],
+                      "workernames": ["bot1021"]
+                    },
+                    { "name": "Apple-Monterey-Release-AppleSilicon-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "monterey-release-applesilicon-tests-wk2",
+                      "platform": "mac-monterey", "configuration": "release", "architectures": ["x86_64", "arm64"],
+                      "additionalArguments": ["--no-retry-failures"],
+                      "workernames": ["bot135"]
+                    },
+                    { "name": "Apple-Monterey-Release-AppleSilicon-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "monterey-release-applesilicon-tests-wk1",
+                      "platform": "mac-monterey", "configuration": "release", "architectures": ["x86_64", "arm64"],
+                      "additionalArguments": ["--no-retry-failures"],
+                      "workernames": ["bot138"]
+                    },
+                    { "name": "Apple-Monterey-Release-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "monterey-release-tests-wk2",
+                      "platform": "mac-monterey", "configuration": "release", "architectures": ["x86_64", "arm64"],
+                      "additionalArguments": ["--no-retry-failures"],
+                      "workernames": ["bot1023"]
+                    },
+                    { "name": "Apple-Monterey-Debug-Build", "factory": "BuildFactory", "builddir": "monterey-debug",
+                      "platform": "mac-monterey", "configuration": "debug", "architectures": ["x86_64", "arm64"],
+                      "triggers": [
+                          "monterey-debug-tests-test262", "monterey-debug-tests-wk1", "monterey-debug-tests-wk2", "monterey-debug-applesilicon-tests-wk1",
+                          "monterey-debug-applesilicon-tests-wk2", "monterey-applesilicon-debug-tests-jsc"
+                      ],
+                      "workernames": ["bot198", "bot279"]
+                    },
+                    { "name": "Apple-Monterey-Debug-Test262-Tests", "factory": "Test262Factory", "builddir": "monterey-debug-tests-test262",
+                      "platform": "mac-monterey", "configuration": "debug", "architectures": ["x86_64", "arm64"],
+                      "workernames": ["bot603"]
+                    },
+                    { "name": "Apple-Monterey-Debug-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "monterey-debug-tests-wk1",
+                      "platform": "mac-monterey", "configuration": "debug", "architectures": ["x86_64", "arm64"],
+                      "additionalArguments": ["--no-retry-failures"],
+                      "workernames": ["bot1025"]
+                    },
+                    { "name": "Apple-Monterey-Debug-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "monterey-debug-tests-wk2",
+                      "platform": "mac-monterey", "configuration": "debug", "architectures": ["x86_64", "arm64"],
+                      "additionalArguments": ["--no-retry-failures"],
+                      "workernames": ["bot1026"]
+                    },
+                    { "name": "Apple-Monterey-Debug-AppleSilicon-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "monterey-debug-applesilicon-tests-wk1",
+                      "platform": "mac-monterey", "configuration": "debug", "architectures": ["x86_64", "arm64"],
+                      "additionalArguments": ["--no-retry-failures"],
+                      "workernames": ["bot139"]
+                    },
+                    { "name": "Apple-Monterey-Debug-AppleSilicon-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "monterey-debug-applesilicon-tests-wk2",
+                      "platform": "mac-monterey", "configuration": "debug", "architectures": ["x86_64", "arm64"],
+                      "additionalArguments": ["--no-retry-failures"],
+                      "workernames": ["bot141"]
+                    },
+                    { "name": "Apple-Monterey-AppleSilicon-Debug-JSC-Tests", "factory": "TestJSCFactory", "builddir": "monterey-applesilicon-debug-tests-jsc",
+                      "platform": "mac-monterey", "configuration": "debug", "architectures": ["x86_64", "arm64"],
+                      "workernames": ["bot105"]
+                    },
+                    { "name": "Apple-Monterey-AppleSilicon-Release-JSC-Tests", "factory": "TestJSCFactory", "builddir": "monterey-applesilicon-release-tests-jsc",
+                      "platform": "mac-monterey", "configuration": "release", "architectures": ["x86_64", "arm64"],
+                      "workernames": ["bot111"]
+                    },
+                    { "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"
+                      ],
+                      "workernames": ["bot121", "bot124"]
+                    },
                     { "name": "Apple-BigSur-Release-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "bigsur-release-tests-wk1",
                       "platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64", "arm64"],
                       "additionalArguments": ["--no-retry-failures"],
-                      "workernames": ["bot1020", "bot1021"]
+                      "workernames": ["bot1020"]
                     },
                     { "name": "Apple-BigSur-Release-AppleSilicon-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "bigsur-release-applesilicon-tests-wk2",
                       "platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64", "arm64"],
                       "additionalArguments": ["--no-retry-failures"],
-                      "workernames": ["bot132", "bot135"]
+                      "workernames": ["bot132"]
                     },
                     { "name": "Apple-BigSur-Release-AppleSilicon-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "bigsur-release-applesilicon-tests-wk1",
                       "platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64", "arm64"],
                       "additionalArguments": ["--no-retry-failures"],
-                      "workernames": ["bot137", "bot138"]
+                      "workernames": ["bot137"]
                     },
                     { "name": "Apple-BigSur-Release-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "bigsur-release-tests-wk2",
                       "platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64", "arm64"],
                       "additionalArguments": ["--no-retry-failures"],
-                      "workernames": ["bot1022", "bot1023"]
+                      "workernames": ["bot1022"]
                     },
                     { "name": "Apple-BigSur-Release-WK2-WebGL-GPUProcess-Tests", "factory": "TestAllButJSCFactory", "builddir": "bigsur-release-tests-wk2-webgl-gpuprocess",
                       "platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64", "arm64"],
@@ -176,43 +247,31 @@
                     { "name": "Apple-BigSur-Debug-Build", "factory": "BuildFactory", "builddir": "bigsur-debug",
                       "platform": "mac-bigsur", "configuration": "debug", "architectures": ["x86_64", "arm64"],
                       "triggers": [
-                          "bigsur-debug-tests-test262", "bigsur-debug-tests-wk1", "bigsur-debug-tests-wk2", "bigsur-debug-applesilicon-tests-wk1",
-                          "bigsur-debug-applesilicon-tests-wk2", "bigsur-applesilicon-debug-tests-jsc"
+                          "bigsur-debug-tests-wk1", "bigsur-debug-tests-wk2", "bigsur-debug-applesilicon-tests-wk1",
+                          "bigsur-debug-applesilicon-tests-wk2"
                       ],
                       "workernames": ["bot126", "bot131"]
                     },
-                    { "name": "Apple-BigSur-Debug-Test262-Tests", "factory": "Test262Factory", "builddir": "bigsur-debug-tests-test262",
-                      "platform": "mac-bigsur", "configuration": "debug", "architectures": ["x86_64", "arm64"],
-                      "workernames": ["bot603"]
-                    },
                     { "name": "Apple-BigSur-Debug-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "bigsur-debug-tests-wk1",
                       "platform": "mac-bigsur", "configuration": "debug", "architectures": ["x86_64", "arm64"],
                       "additionalArguments": ["--no-retry-failures"],
-                      "workernames": ["bot1024", "bot1025"]
+                      "workernames": ["bot1024"]
                     },
                     { "name": "Apple-BigSur-Debug-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "bigsur-debug-tests-wk2",
                       "platform": "mac-bigsur", "configuration": "debug", "architectures": ["x86_64", "arm64"],
                       "additionalArguments": ["--no-retry-failures"],
-                      "workernames": ["bot1026", "bot1027"]
+                      "workernames": ["bot1027"]
                     },
                     { "name": "Apple-BigSur-Debug-AppleSilicon-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "bigsur-debug-applesilicon-tests-wk1",
                       "platform": "mac-bigsur", "configuration": "debug", "architectures": ["x86_64", "arm64"],
                       "additionalArguments": ["--no-retry-failures"],
-                      "workernames": ["bot139", "bot140"]
+                      "workernames": ["bot140"]
                     },
                     { "name": "Apple-BigSur-Debug-AppleSilicon-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "bigsur-debug-applesilicon-tests-wk2",
                       "platform": "mac-bigsur", "configuration": "debug", "architectures": ["x86_64", "arm64"],
                       "additionalArguments": ["--no-retry-failures"],
-                      "workernames": ["bot141", "bot142"]
+                      "workernames": ["bot142"]
                     },
-                    { "name": "Apple-BigSur-AppleSilicon-Debug-JSC-Tests", "factory": "TestJSCFactory", "builddir": "bigsur-applesilicon-debug-tests-jsc",
-                      "platform": "mac-bigsur", "configuration": "debug", "architectures": ["x86_64", "arm64"],
-                      "workernames": ["bot105"]
-                    },
-                    { "name": "Apple-BigSur-AppleSilicon-Release-JSC-Tests", "factory": "TestJSCFactory", "builddir": "bigsur-applesilicon-release-tests-jsc",
-                      "platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64", "arm64"],
-                      "workernames": ["bot111"]
-                    }, 
                     { "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"],
@@ -577,6 +636,48 @@
                                        "WPE-Linux-64-bit-Release-Build", "WPE-Linux-64-bit-Debug-Build",
                                        "WPE-Linux-64-bit-Release-Non-Unified-Build"]
                     },
+                    { "type": "PlatformSpecificScheduler", "platform": "mac-monterey", "branch": "trunk", "treeStableTimer": 45.0,
+                      "builderNames": ["Apple-Monterey-Release-Build", "Apple-Monterey-Debug-Build"]
+                    },
+                    { "type": "Triggerable", "name": "monterey-release-tests-wk1",
+                      "builderNames": ["Apple-Monterey-Release-WK1-Tests"]
+                    },
+                    { "type": "Triggerable", "name": "monterey-release-tests-wk2",
+                      "builderNames": ["Apple-Monterey-Release-WK2-Tests"]
+                    },
+                    { "type": "Triggerable", "name": "monterey-release-applesilicon-tests-wk1",
+                      "builderNames": ["Apple-Monterey-Release-AppleSilicon-WK1-Tests"]
+                    },
+                    { "type": "Triggerable", "name": "monterey-release-applesilicon-tests-wk2",
+                      "builderNames": ["Apple-Monterey-Release-AppleSilicon-WK2-Tests"]
+                    },
+                    { "type": "Triggerable", "name": "monterey-debug-tests-wk1",
+                      "builderNames": ["Apple-Monterey-Debug-WK1-Tests"]
+                    },
+                    { "type": "Triggerable", "name": "monterey-debug-tests-wk2",
+                      "builderNames": ["Apple-Monterey-Debug-WK2-Tests"]
+                    },
+                    { "type": "Triggerable", "name": "monterey-debug-applesilicon-tests-wk1",
+                      "builderNames": ["Apple-Monterey-Debug-AppleSilicon-WK1-Tests"]
+                    },
+                    { "type": "Triggerable", "name": "monterey-debug-applesilicon-tests-wk2",
+                      "builderNames": ["Apple-Monterey-Debug-AppleSilicon-WK2-Tests"]
+                    },
+                    { "type": "Triggerable", "name": "monterey-debug-tests-test262",
+                      "builderNames": ["Apple-Monterey-Debug-Test262-Tests"]
+                    },
+                    { "type": "Triggerable", "name": "monterey-release-tests-test262",
+                      "builderNames": ["Apple-Monterey-Release-Test262-Tests"]
+                    },
+                    { "type": "Triggerable", "name": "monterey-applesilicon-release-tests-test262",
+                      "builderNames": ["Apple-Monterey-AppleSilicon-Release-Test262-Tests"]
+                    },
+                    { "type": "Triggerable", "name": "monterey-applesilicon-debug-tests-jsc",
+                      "builderNames": ["Apple-Monterey-AppleSilicon-Debug-JSC-Tests"]
+                    },
+                    { "type": "Triggerable", "name": "monterey-applesilicon-release-tests-jsc",
+                      "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"]
                     },
@@ -607,21 +708,6 @@
                     { "type": "Triggerable", "name": "bigsur-debug-applesilicon-tests-wk2",
                       "builderNames": ["Apple-BigSur-Debug-AppleSilicon-WK2-Tests"]
                     },
-                    { "type": "Triggerable", "name": "bigsur-debug-tests-test262",
-                      "builderNames": ["Apple-BigSur-Debug-Test262-Tests"]
-                    },
-                    { "type": "Triggerable", "name": "bigsur-release-tests-test262",
-                      "builderNames": ["Apple-BigSur-Release-Test262-Tests"]
-                    },
-                    { "type": "Triggerable", "name": "bigsur-applesilicon-release-tests-test262",
-                      "builderNames": ["Apple-BigSur-AppleSilicon-Release-Test262-Tests"]
-                    },
-                    { "type": "Triggerable", "name": "bigsur-applesilicon-debug-tests-jsc",
-                      "builderNames": ["Apple-BigSur-AppleSilicon-Debug-JSC-Tests"]
-                    },
-                    { "type": "Triggerable", "name": "bigsur-applesilicon-release-tests-jsc",
-                      "builderNames": ["Apple-BigSur-AppleSilicon-Release-JSC-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"]
                     },

Modified: trunk/Tools/CISupport/build-webkit-org/factories_unittest.py (284798 => 284799)


--- trunk/Tools/CISupport/build-webkit-org/factories_unittest.py	2021-10-25 18:04:45 UTC (rev 284798)
+++ trunk/Tools/CISupport/build-webkit-org/factories_unittest.py	2021-10-25 18:06:47 UTC (rev 284799)
@@ -28,7 +28,7 @@
 class TestExpectedBuildSteps(unittest.TestCase):
 
     expected_steps = {
-        'Apple-BigSur-Release-Build': [
+        'Apple-Monterey-Release-Build': [
             'configure-build',
             'configuration',
             'clean-and-update-working-directory',
@@ -44,7 +44,7 @@
             'transfer-to-s3',
             'trigger'
         ],
-        'Apple-BigSur-AppleSilicon-Release-Test262-Tests': [
+        'Apple-Monterey-AppleSilicon-Release-Test262-Tests': [
             'configure-build',
             'configuration',
             'clean-and-update-working-directory',
@@ -56,7 +56,7 @@
             'extract-built-product',
             'test262-test'
         ],
-        'Apple-BigSur-Release-Test262-Tests': [
+        'Apple-Monterey-Release-Test262-Tests': [
             'configure-build',
             'configuration',
             'clean-and-update-working-directory',
@@ -68,7 +68,7 @@
             'extract-built-product',
             'test262-test'
         ],
-        'Apple-BigSur-Release-WK1-Tests': [
+        'Apple-Monterey-Release-WK1-Tests': [
             'configure-build',
             'configuration',
             'clean-and-update-working-directory',
@@ -93,7 +93,7 @@
             'builtins-generator-tests',
             'trigger-crash-log-submission'
         ],
-        'Apple-BigSur-Release-AppleSilicon-WK2-Tests': [
+        'Apple-Monterey-Release-AppleSilicon-WK2-Tests': [
             'configure-build',
             'configuration',
             'clean-and-update-working-directory',
@@ -118,7 +118,7 @@
             'builtins-generator-tests',
             'trigger-crash-log-submission'
         ],
-        'Apple-BigSur-Release-AppleSilicon-WK1-Tests': [
+        'Apple-Monterey-Release-AppleSilicon-WK1-Tests': [
             'configure-build',
             'configuration',
             'clean-and-update-working-directory',
@@ -143,7 +143,7 @@
             'builtins-generator-tests',
             'trigger-crash-log-submission'
         ],
-        'Apple-BigSur-Release-WK2-Tests': [
+        'Apple-Monterey-Release-WK2-Tests': [
             'configure-build',
             'configuration',
             'clean-and-update-working-directory',
@@ -168,7 +168,7 @@
             'builtins-generator-tests',
             'trigger-crash-log-submission'
         ],
-        'Apple-BigSur-Release-WK2-WebGL-GPUProcess-Tests': [
+        'Apple-Monterey-Debug-Build': [
             'configure-build',
             'configuration',
             'clean-and-update-working-directory',
@@ -176,8 +176,36 @@
             '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-Monterey-Debug-Test262-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',
+            'test262-test'
+        ],
+        'Apple-Monterey-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',
             'layout-test',
             'dashboard-tests',
@@ -193,7 +221,7 @@
             'builtins-generator-tests',
             'trigger-crash-log-submission'
         ],
-        'Apple-BigSur-Debug-Build': [
+        'Apple-Monterey-Debug-WK2-Tests': [
             'configure-build',
             'configuration',
             'clean-and-update-working-directory',
@@ -201,6 +229,105 @@
             'kill-old-processes',
             'delete-WebKitBuild-directory',
             'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
+        ],
+        'Apple-Monterey-Debug-AppleSilicon-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',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
+        ],
+        'Apple-Monterey-Debug-AppleSilicon-WK2-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',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
+        ],
+        'Apple-Monterey-AppleSilicon-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-Monterey-AppleSilicon-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-Release-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
             'compile-webkit',
             'archive-built-product',
             'upload',
@@ -209,7 +336,7 @@
             'transfer-to-s3',
             'trigger'
         ],
-        'Apple-BigSur-Debug-Test262-Tests': [
+        'Apple-BigSur-Release-WK1-Tests': [
             'configure-build',
             'configuration',
             'clean-and-update-working-directory',
@@ -219,9 +346,22 @@
             'delete-stale-build-files',
             'download-built-product',
             'extract-built-product',
-            'test262-test'
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
         ],
-        'Apple-BigSur-Debug-WK1-Tests': [
+        'Apple-BigSur-Release-AppleSilicon-WK2-Tests': [
             'configure-build',
             'configuration',
             'clean-and-update-working-directory',
@@ -246,7 +386,7 @@
             'builtins-generator-tests',
             'trigger-crash-log-submission'
         ],
-        'Apple-BigSur-Debug-WK2-Tests': [
+        'Apple-BigSur-Release-AppleSilicon-WK1-Tests': [
             'configure-build',
             'configuration',
             'clean-and-update-working-directory',
@@ -271,7 +411,7 @@
             'builtins-generator-tests',
             'trigger-crash-log-submission'
         ],
-        'Apple-BigSur-Debug-AppleSilicon-WK1-Tests': [
+        'Apple-BigSur-Release-WK2-Tests': [
             'configure-build',
             'configuration',
             'clean-and-update-working-directory',
@@ -296,7 +436,7 @@
             'builtins-generator-tests',
             'trigger-crash-log-submission'
         ],
-        'Apple-BigSur-Debug-AppleSilicon-WK2-Tests': [
+        'Apple-BigSur-Release-WK2-WebGL-GPUProcess-Tests': [
             'configure-build',
             'configuration',
             'clean-and-update-working-directory',
@@ -321,7 +461,7 @@
             'builtins-generator-tests',
             'trigger-crash-log-submission'
         ],
-        'Apple-BigSur-AppleSilicon-Debug-JSC-Tests': [
+        'Apple-BigSur-Debug-Build': [
             'configure-build',
             'configuration',
             'clean-and-update-working-directory',
@@ -329,11 +469,40 @@
             '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-BigSur-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',
-            'jscore-test'
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
         ],
-        'Apple-BigSur-AppleSilicon-Release-JSC-Tests': [
+        'Apple-BigSur-Debug-WK2-Tests': [
             'configure-build',
             'configuration',
             'clean-and-update-working-directory',
@@ -343,8 +512,71 @@
             'delete-stale-build-files',
             'download-built-product',
             'extract-built-product',
-            'jscore-test'
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
         ],
+        'Apple-BigSur-Debug-AppleSilicon-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',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
+        ],
+        'Apple-BigSur-Debug-AppleSilicon-WK2-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',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
+        ],
         'Apple-Catalina-Debug-Build': [
             'configure-build',
             'configuration',

Modified: trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js (284798 => 284799)


--- trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js	2021-10-25 18:04:45 UTC (rev 284798)
+++ trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js	2021-10-25 18:06:47 UTC (rev 284799)
@@ -26,6 +26,23 @@
 WebKitBuildbot = function()
 {
     const queueInfo = {
+        "Apple-Monterey-Release-Build": {platform: Dashboard.Platform.macOSMonterey, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+        "Apple-Monterey-Debug-Build": {platform: Dashboard.Platform.macOSMonterey, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
+        "Apple-Monterey-Debug-WK1-Tests": {platform: Dashboard.Platform.macOSMonterey, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
+        "Apple-Monterey-Debug-WK2-Tests": {platform: Dashboard.Platform.macOSMonterey, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+        "Apple-Monterey-Release-WK1-Tests": {platform: Dashboard.Platform.macOSMonterey, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
+        "Apple-Monterey-Release-WK2-Tests": {platform: Dashboard.Platform.macOSMonterey, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+        "Apple-Monterey-Debug-AppleSilicon-WK1-Tests": {platform: Dashboard.Platform.macOSMonterey, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1, heading: "Debug AppleSilicon"},
+        "Apple-Monterey-Debug-AppleSilicon-WK2-Tests": {platform: Dashboard.Platform.macOSMonterey, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2, heading: "Debug AppleSilicon"},
+        "Apple-Monterey-Release-AppleSilicon-WK1-Tests": {platform: Dashboard.Platform.macOSMonterey, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1, heading: "Release AppleSilicon"},
+        "Apple-Monterey-Release-AppleSilicon-WK2-Tests": {platform: Dashboard.Platform.macOSMonterey, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2, heading: "Release AppleSilicon"},
+        "Apple-Monterey JSC": {platform: Dashboard.Platform.macOSMonterey, heading: "_javascript_", combinedQueues: {
+            "Apple-Monterey-Debug-Test262-Tests": {heading: "Debug Test262 (Tests)"},
+            "Apple-Monterey-Release-Test262-Tests": {heading: "Release Test262 (Tests)"},
+            "Apple-Monterey-AppleSilicon-Release-Test262-Tests": {heading: "Release arm64 Test262 (Tests)"},
+            "Apple-Monterey-AppleSilicon-Debug-JSC-Tests": {heading: "Debug arm64 JSC (Tests)"},
+            "Apple-Monterey-AppleSilicon-Release-JSC-Tests": {heading: "Release arm64 JSC (Tests)"},
+        }},
         "Apple-BigSur-Release-Build": {platform: Dashboard.Platform.macOSBigSur, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
         "Apple-BigSur-Debug-Build": {platform: Dashboard.Platform.macOSBigSur, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
         "Apple-BigSur-Debug-WK1-Tests": {platform: Dashboard.Platform.macOSBigSur, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
@@ -36,13 +53,6 @@
         "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-Debug-Test262-Tests": {heading: "Debug Test262 (Tests)"},
-            "Apple-BigSur-Release-Test262-Tests": {heading: "Release Test262 (Tests)"},
-            "Apple-BigSur-AppleSilicon-Release-Test262-Tests": {heading: "Release arm64 Test262 (Tests)"},
-            "Apple-BigSur-AppleSilicon-Debug-JSC-Tests": {heading: "Debug arm64 JSC (Tests)"},
-            "Apple-BigSur-AppleSilicon-Release-JSC-Tests": {heading: "Release arm64 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},

Modified: trunk/Tools/CISupport/build-webkit-org/wkbuild.py (284798 => 284799)


--- trunk/Tools/CISupport/build-webkit-org/wkbuild.py	2021-10-25 18:04:45 UTC (rev 284798)
+++ trunk/Tools/CISupport/build-webkit-org/wkbuild.py	2021-10-25 18:06:47 UTC (rev 284799)
@@ -45,6 +45,7 @@
         "mac-mojave",
         "mac-catalina",
         "mac-bigsur",
+        "mac-monterey",
         "win",
         "ios-15",
         "ios-simulator-15",
@@ -76,7 +77,8 @@
         ("LayoutTests/platform/mac-highsierra", ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra"]),
         ("LayoutTests/platform/mac-mojave", ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
         ("LayoutTests/platform/mac-catalina", ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave", "mac-bigsur"]),
-        ("LayoutTests/platform/mac-bigsur", ["mac-bigsur"]),
+        ("LayoutTests/platform/mac-bigsur", ["mac-catalina", "mac-bigsur"]),
+        ("LayoutTests/platform/mac-monterey", ["mac-catalina", "mac-bigsur", "mac-monterey"]),
         ("LayoutTests/platform/mac-wk2", ["mac"]),
         ("LayoutTests/platform/mac-wk1", ["mac"]),
         ("LayoutTests/platform/mac", ["mac", "win"]),

Modified: trunk/Tools/ChangeLog (284798 => 284799)


--- trunk/Tools/ChangeLog	2021-10-25 18:04:45 UTC (rev 284798)
+++ trunk/Tools/ChangeLog	2021-10-25 18:06:47 UTC (rev 284799)
@@ -1,3 +1,18 @@
+2021-10-25  Ryan Haddad  <[email protected]>
+
+        Bring up queues for Monterey
+        https://bugs.webkit.org/show_bug.cgi?id=232186
+
+        Reviewed by Alexey Proskuryakov.
+
+        * CISupport/build-webkit-org/config.json:
+        * CISupport/build-webkit-org/factories_unittest.py:
+        (TestExpectedBuildSteps):
+        * CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js:
+        (WebKitBuildbot):
+        * CISupport/build-webkit-org/wkbuild.py:
+        (_should_file_trigger_build):
+
 2021-10-25  Jonathan Bedard  <[email protected]>
 
         [webkitscmpy] Log based tests fail in different timezones

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to