Bring up a queue to test run-webkit-tests --site-isolation

rdar://119899034 https://bugs.webkit.org/show_bug.cgi?id=267309 Reviewed by Jonathan Bedard. Config changes to bring up an individual site isolation queue. * Tools/CISupport/build-webkit-org/config.json: * Tools/CISupport/build-webkit-org/factories_unittest.py: (TestExpectedBuildSteps): Canonical link: https://commits.webkit.org/273197@main
WebKit · Jan 19, 2024 · d905fc0 · d905fc0
1 parent a9ea311
commit d905fc0
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/Tools/CISupport/build-webkit-org/config.json b/Tools/CISupport/build-webkit-org/config.json
@@ -16,6 +16,7 @@
                   { "name": "bot178", "platform": "mac-sonoma" },
                   { "name": "bot179", "platform": "mac-sonoma" },
                   { "name": "bot184", "platform": "mac-sonoma" },
+                  { "name": "bot303", "platform": "mac-sonoma" },
 
                   { "name": "bot183", "platform": "mac-ventura" },
                   { "name": "bot211", "platform": "mac-ventura" },
@@ -49,7 +50,6 @@
                   { "name": "bot1025", "platform": "mac-monterey" },
                   { "name": "bot1026", "platform": "mac-monterey" },
 
-                  { "name": "bot303", "platform": "ios-simulator-17" },
                   { "name": "bot304", "platform": "ios-17" },
                   { "name": "bot305", "platform": "ios-simulator-17" },
                   { "name": "bot306", "platform": "ios-simulator-17" },
@@ -187,11 +187,16 @@
                     "additionalArguments": ["--no-retry-failures", "--accessibility-isolated-tree", "accessibility/"],
                     "workernames": ["bot179"]
                   },
+                  { "name": "Apple-Sonoma-Debug-WK2-Site-Isolation-Tree-Tests", "factory": "TestLayoutFactory",
+                  "platform": "mac-sonoma", "configuration": "debug", "architectures": ["x86_64", "arm64"],
+                  "additionalArguments": ["--no-retry-failures", "--site-isolation"],
+                  "workernames": ["bot303"]
+                  },
                   { "name": "Apple-Sonoma-Debug-Build", "factory": "BuildFactory",
                   "platform": "mac-sonoma", "configuration": "debug", "architectures": ["x86_64", "arm64"],
                   "triggers": [
                       "sonoma-debug-tests-wk1", "sonoma-debug-tests-wk2", "sonoma-debug-applesilicon-tests-wk1",
-                      "sonoma-debug-applesilicon-tests-wk2"
+                      "sonoma-debug-applesilicon-tests-wk2", "sonoma-debug-tests-wk2-site-isolation-tree"
                   ],
                   "workernames": ["bot247", "bot248"]
                   },
@@ -357,7 +362,7 @@
                     "name": "Apple-iOS-17-Simulator-Release-Build", "factory": "BuildFactory",
                     "platform": "ios-simulator-17", "configuration": "release", "architectures": ["x86_64", "arm64"],
                     "triggers": ["ios-simulator-17-release-tests-wk2", "ipados-simulator-17-release-tests-wk2"],
-                    "workernames": ["bot303", "bot305", "bot306"]
+                    "workernames": ["bot305", "bot306"]
                   },
                   {
                     "name": "Apple-iOS-17-Simulator-Debug-Build", "factory": "BuildFactory",
@@ -734,6 +739,9 @@
                   { "type": "Triggerable", "name": "sonoma-applesilicon-release-tests-test262",
                   "builderNames": ["Apple-Sonoma-AppleSilicon-Release-Test262-Tests"]
                   },
+                  { "type": "Triggerable", "name": "sonoma-debug-tests-wk2-site-isolation-tree",
+                  "builderNames": ["Apple-Sonoma-Debug-WK2-Site-Isolation-Tree-Tests"]
+                  },
                   { "type": "PlatformSpecificScheduler", "platform": "mac-ventura", "branch": "main", "treeStableTimer": 45.0,
                   "builderNames": ["Apple-Ventura-Release-Build", "Apple-Ventura-Debug-Build"]
                   },

diff --git a/Tools/CISupport/build-webkit-org/factories_unittest.py b/Tools/CISupport/build-webkit-org/factories_unittest.py
@@ -340,6 +340,25 @@ class TestExpectedBuildSteps(unittest.TestCase):
             'extract-test-results',
             'set-permissions',
         ],
+        'Apple-Sonoma-Debug-WK2-Site-Isolation-Tree-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'prune-coresymbolicationd-cache-if-too-large',
+            'download-built-product',
+            'extract-built-product',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+        ],
         'Apple-Ventura-Release-Build': [
             'configure-build',
             'configuration',