Title: [286791] trunk/Tools
Revision
286791
Author
ryanhad...@apple.com
Date
2021-12-09 11:12:44 -0800 (Thu, 09 Dec 2021)

Log Message

Bring up another iOS GPU Processes tester
https://bugs.webkit.org/show_bug.cgi?id=234016

Rubber-stamped by Alexey Proskuryakov.

* CISupport/build-webkit-org/config.json: Repurpose the Catalina GPU bot for this queue.
* CISupport/build-webkit-org/factories_unittest.py:
(TestExpectedBuildSteps): Update unit tests.

Modified Paths

Diff

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


--- trunk/Tools/CISupport/build-webkit-org/config.json	2021-12-09 19:07:58 UTC (rev 286790)
+++ trunk/Tools/CISupport/build-webkit-org/config.json	2021-12-09 19:12:44 UTC (rev 286791)
@@ -45,7 +45,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" },
@@ -60,6 +59,7 @@
                     { "name": "bot684", "platform": "*" },
 
                     { "name": "bot210", "platform": "ios-simulator-15" },
+                    { "name": "bot260", "platform": "ios-simulator-15" },
                     { "name": "bot673", "platform": "ios-15" },
                     { "name": "bot614", "platform": "ios-simulator-15" },
                     { "name": "bot651", "platform": "ios-simulator-15" },
@@ -273,7 +273,7 @@
                     },
                     { "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-jsc", "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,11 +286,6 @@
                       "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"],
@@ -331,7 +326,7 @@
                     {
                       "name": "Apple-iOS-15-Simulator-Release-Build", "factory": "BuildFactory", "builddir": "ios-simulator-15-release",
                       "platform": "ios-simulator-15", "configuration": "release", "architectures": ["x86_64", "arm64"],
-                      "triggers": ["ios-simulator-15-release-gpuprocess-arm64-tests-wk2", "ios-simulator-15-release-tests-wk2", "ipados-simulator-15-release-tests-wk2"],
+                      "triggers": ["ios-simulator-15-release-gpuprocess-arm64-tests-wk2", "ios-simulator-15-release-gpuprocess-tests-wk2", "ios-simulator-15-release-tests-wk2", "ipados-simulator-15-release-tests-wk2"],
                       "workernames": ["bot614", "bot641", "bot682", "bot685"]
                     },
                     {
@@ -347,6 +342,12 @@
                       "workernames": ["bot210"]
                     },
                     {
+                      "name": "Apple-iOS-15-Simulator-Release-GPUProcess-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "ios-simulator-15-release-gpuprocess-tests-wk2",
+                      "platform": "ios-simulator-15", "configuration": "release", "architectures": ["x86_64", "arm64"], "device_model": "iphone",
+                      "additionalArguments": ["--no-retry-failures", "--use-gpu-process", "--accelerated-drawing"],
+                      "workernames": ["bot260"]
+                    },
+                    {
                       "name": "Apple-iOS-15-Simulator-Release-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "ios-simulator-15-release-tests-wk2",
                       "platform": "ios-simulator-15", "configuration": "release", "architectures": ["x86_64", "arm64"], "device_model": "iphone",
                       "additionalArguments": ["--no-retry-failures"],
@@ -725,9 +726,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"]
                     },
@@ -758,6 +756,9 @@
                     { "type": "Triggerable", "name": "ios-simulator-15-release-gpuprocess-arm64-tests-wk2",
                       "builderNames": ["Apple-iOS-15-Simulator-Release-GPUProcess-arm64-WK2-Tests"]
                     },
+                    { "type": "Triggerable", "name": "ios-simulator-15-release-gpuprocess-tests-wk2",
+                      "builderNames": ["Apple-iOS-15-Simulator-Release-GPUProcess-WK2-Tests"]
+                    },
                     { "type": "Triggerable", "name": "ios-simulator-15-release-tests-wk2",
                       "builderNames": ["Apple-iOS-15-Simulator-Release-WK2-Tests"]
                     },

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


--- trunk/Tools/CISupport/build-webkit-org/factories_unittest.py	2021-12-09 19:07:58 UTC (rev 286790)
+++ trunk/Tools/CISupport/build-webkit-org/factories_unittest.py	2021-12-09 19:12:44 UTC (rev 286791)
@@ -641,30 +641,6 @@
             'builtins-generator-tests',
             'trigger-crash-log-submission'
         ],
-        'Apple-Catalina-Debug-WK2-GPUProcess-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',
-            'webkitpy-test',
-            'webkitperl-test',
-            'bindings-generation-tests',
-            'builtins-generator-tests',
-            'trigger-crash-log-submission'
-        ],
         'Apple-Catalina-Release-Build': [
             'configure-build',
             'configuration',
@@ -842,6 +818,30 @@
             'builtins-generator-tests',
             'trigger-crash-log-submission'
         ],
+        'Apple-iOS-15-Simulator-Release-GPUProcess-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',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
+        ],
         'Apple-iOS-15-Simulator-Release-WK2-Tests': [
             'configure-build',
             'configuration',

Modified: trunk/Tools/ChangeLog (286790 => 286791)


--- trunk/Tools/ChangeLog	2021-12-09 19:07:58 UTC (rev 286790)
+++ trunk/Tools/ChangeLog	2021-12-09 19:12:44 UTC (rev 286791)
@@ -1,3 +1,14 @@
+2021-12-09  Ryan Haddad  <ryanhad...@apple.com>
+
+        Bring up another iOS GPU Processes tester
+        https://bugs.webkit.org/show_bug.cgi?id=234016
+
+        Rubber-stamped by Alexey Proskuryakov.
+
+        * CISupport/build-webkit-org/config.json: Repurpose the Catalina GPU bot for this queue.
+        * CISupport/build-webkit-org/factories_unittest.py:
+        (TestExpectedBuildSteps): Update unit tests.
+
 2021-12-09  Brady Eidson  <beid...@apple.com>
 
         Add ability to inject messages into webpushd
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to