[webkit-changes] [273926] trunk/Tools

Thu, 04 Mar 2021 15:38:44 -0800

Title: [273926] trunk/Tools
Revision
273926
Author
jlew...@apple.com
Date
2021-03-04 15:37:58 -0800 (Thu, 04 Mar 2021)

Log Message

Add Apple Silicon Devices to Big Sur builders and testers.
https://bugs.webkit.org/show_bug.cgi?id=222616

Reviewed by Aakash Jain.

* CISupport/build-webkit-org/config.json:
* CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js:
(WebKitBuildbot):

Modified Paths

Diff

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


--- trunk/Tools/CISupport/build-webkit-org/config.json	2021-03-04 23:30:44 UTC (rev 273925)
+++ trunk/Tools/CISupport/build-webkit-org/config.json	2021-03-04 23:37:58 UTC (rev 273926)
@@ -1,13 +1,23 @@
 {
     "workers":     [
+                    { "name": "bot105", "platform": "mac-bigsur" },
+                    { "name": "bot111", "platform": "mac-bigsur" },
+                    { "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": "bot279", "platform": "mac-bigsur" },
                     { "name": "bot302", "platform": "mac-bigsur" },
-                    { "name": "bot600", "platform": "mac-bigsur" },
                     { "name": "bot603", "platform": "mac-bigsur" },
-                    { "name": "bot614", "platform": "mac-bigsur" },
                     { "name": "bot632", "platform": "mac-bigsur" },
-                    { "name": "bot684", "platform": "mac-bigsur" },
-                    { "name": "bot685", "platform": "mac-bigsur" },
                     { "name": "bot1020", "platform": "mac-bigsur" },
                     { "name": "bot1021", "platform": "mac-bigsur" },
                     { "name": "bot1022", "platform": "mac-bigsur" },
@@ -17,7 +27,6 @@
                     { "name": "bot1026", "platform": "mac-bigsur" },
                     { "name": "bot1027", "platform": "mac-bigsur" },
 
-                    { "name": "bot121", "platform": "mac-catalina" },
                     { "name": "bot187", "platform": "mac-catalina" },
                     { "name": "bot205", "platform": "mac-catalina" },
                     { "name": "bot241", "platform": "mac-catalina" },
@@ -37,7 +46,6 @@
                     { "name": "bot688", "platform": "mac-catalina" },
 
 
-                    { "name": "bot132", "platform": "*" },
                     { "name": "bot178", "platform": "*" },
                     { "name": "bot179", "platform": "*" },
                     { "name": "bot183", "platform": "*" },
@@ -48,6 +56,10 @@
                     { "name": "bot611", "platform": "*" },
                     { "name": "bot612", "platform": "*" },
                     { "name": "bot613", "platform": "*" },
+                    { "name": "bot600", "platform": "*" },
+                    { "name": "bot614", "platform": "*" },
+                    { "name": "bot684", "platform": "*" },
+                    { "name": "bot685", "platform": "*" },
 
 
                     { "name": "bot673", "platform": "ios-14" },
@@ -121,8 +133,11 @@
     "builders":   [
                     { "name": "Apple-BigSur-Release-Build", "factory": "BuildFactory", "builddir": "bigsur-release",
                       "platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64", "arm64"],
-                      "triggers": ["bigsur-release-tests-test262", "bigsur-release-tests-wk1", "bigsur-release-tests-wk2", "bigsur-release-tests-wk2-webgl"],
-                      "workernames": ["bot279", "bot600", "bot614"]
+                      "triggers": [
+                          "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"
+                      ],
+                      "workernames": ["bot279", "bot121", "bot124"]
                     },
                     { "name": "Apple-BigSur-Release-Test262-Tests", "factory": "Test262Factory", "builddir": "bigsur-release-tests-test262",
                       "platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64", "arm64"],
@@ -133,6 +148,16 @@
                       "additionalArguments": ["--no-retry-failures"],
                       "workernames": ["bot1020", "bot1021"]
                     },
+                    { "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"]
+                    },
+                    { "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"]
+                    },
                     { "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"],
@@ -145,8 +170,11 @@
                     },
                     { "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"],
-                      "workernames": ["bot684", "bot685"]
+                      "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"
+                      ],
+                      "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"],
@@ -162,6 +190,24 @@
                       "additionalArguments": ["--no-retry-failures"],
                       "workernames": ["bot1026", "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"]
+                    },
+                    { "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"]
+                    },
+                    { "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"],
@@ -177,7 +223,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"],
@@ -508,6 +553,12 @@
                     { "type": "Triggerable", "name": "bigsur-release-tests-wk2",
                       "builderNames": ["Apple-BigSur-Release-WK2-Tests"]
                     },
+                    { "type": "Triggerable", "name": "bigsur-release-applesilicon-tests-wk1",
+                      "builderNames": ["Apple-BigSur-Release-AppleSilicon-WK1-Tests"]
+                    },
+                    { "type": "Triggerable", "name": "bigsur-release-applesilicon-tests-wk2",
+                      "builderNames": ["Apple-BigSur-Release-AppleSilicon-WK2-Tests"]
+                    },
                     { "type": "Triggerable", "name": "bigsur-release-tests-wk2-webgl",
                       "builderNames": ["Apple-BigSur-Release-WK2-WebGL-Tests"]
                     },
@@ -517,6 +568,12 @@
                     { "type": "Triggerable", "name": "bigsur-debug-tests-wk2",
                       "builderNames": ["Apple-BigSur-Debug-WK2-Tests"]
                     },
+                    { "type": "Triggerable", "name": "bigsur-debug-applesilicon-tests-wk1",
+                      "builderNames": ["Apple-BigSur-Debug-AppleSilicon-WK1-Tests"]
+                    },
+                    { "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"]
                     },
@@ -523,6 +580,12 @@
                     { "type": "Triggerable", "name": "bigsur-release-tests-test262",
                       "builderNames": ["Apple-BigSur-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/public_html/dashboard/Scripts/WebKitBuildbot.js (273925 => 273926)


--- trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js	2021-03-04 23:30:44 UTC (rev 273925)
+++ trunk/Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js	2021-03-04 23:37:58 UTC (rev 273926)
@@ -32,9 +32,15 @@
         "Apple-BigSur-Debug-WK2-Tests": {platform: Dashboard.Platform.macOSBigSur, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
         "Apple-BigSur-Release-WK1-Tests": {platform: Dashboard.Platform.macOSBigSur, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
         "Apple-BigSur-Release-WK2-Tests": {platform: Dashboard.Platform.macOSBigSur, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+        "Apple-BigSur-Debug-AppleSilicon-WK1-Tests": {platform: Dashboard.Platform.macOSBigSur, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1, heading: "Debug AppleSilicon"},
+        "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-Debug-AppleSilicon-JSC-Tests": {heading: "Debug arm64 JSC (Tests)"},
+            "Apple-BigSur-Release-AppleSilicon-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},

Modified: trunk/Tools/ChangeLog (273925 => 273926)


--- trunk/Tools/ChangeLog	2021-03-04 23:30:44 UTC (rev 273925)
+++ trunk/Tools/ChangeLog	2021-03-04 23:37:58 UTC (rev 273926)
@@ -1,3 +1,14 @@
+2021-03-04  Matt Lewis  <jlew...@apple.com>
+
+        Add Apple Silicon Devices to Big Sur builders and testers.
+        https://bugs.webkit.org/show_bug.cgi?id=222616
+
+        Reviewed by Aakash Jain.
+
+        * CISupport/build-webkit-org/config.json:
+        * CISupport/build-webkit-org/public_html/dashboard/Scripts/WebKitBuildbot.js:
+        (WebKitBuildbot):
+
 2021-03-04  Aakash Jain  <aakash_j...@apple.com>
 
         [ews] Add python 3 support - part 5

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to