[webkit-changes] [267851] trunk/Tools

Thu, 01 Oct 2020 13:48:49 -0700

Title: [267851] trunk/Tools
Revision
267851
Author
aakash_j...@apple.com
Date
2020-10-01 13:47:54 -0700 (Thu, 01 Oct 2020)

Log Message

[build.webkit.org] Rename type to factory in config.json
https://bugs.webkit.org/show_bug.cgi?id=217127

Reviewed by Jonathan Bedard.

* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/loadConfig.py:
(loadBuilderConfig):
* BuildSlaveSupport/build.webkit.org-config/loadConfig_unittest.py:

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (267850 => 267851)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2020-10-01 20:22:16 UTC (rev 267850)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2020-10-01 20:47:54 UTC (rev 267851)
@@ -108,191 +108,191 @@
                   ],
 
     "builders":   [
-                    { "name": "Apple-BigSur-Release-Build", "type": "Build", "builddir": "bigsur-release",
+                    { "name": "Apple-BigSur-Release-Build", "factory": "BuildFactory", "builddir": "bigsur-release",
                       "platform": "mac-bigsur", "configuration": "release", "architectures": ["x86_64", "arm64"],
                       "slavenames": ["bot279"]
                     },
-                    { "name": "Apple-Catalina-Debug-Build", "type": "Build", "builddir": "catalina-debug",
+                    { "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-test262", "catalina-debug-tests-wk1", "catalina-debug-tests-wk2", "catalina-debug-tests-wk2-gpuprocess"],
                       "slavenames": ["bot687", "bot688"]
                     },
-                    { "name": "Apple-Catalina-Debug-WK1-Tests", "type": "TestWebKit1AllButJSC", "builddir": "catalina-debug-tests-wk1",
+                    { "name": "Apple-Catalina-Debug-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "catalina-debug-tests-wk1",
                       "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot241", "bot242"]
                     },
-                    { "name": "Apple-Catalina-Debug-WK2-Tests", "type": "TestAllButJSC", "builddir": "catalina-debug-tests-wk2",
+                    { "name": "Apple-Catalina-Debug-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "catalina-debug-tests-wk2",
                       "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot243", "bot244"]
                     },
 
-                    { "name": "Apple-Catalina-Debug-WK2-GPUProcess-Tests", "type": "TestAllButJSC", "builddir": "catalina-debug-tests-wk2-gpuprocess",
+                    { "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"],
                       "slavenames": ["bot260"]
                     },
-                    { "name": "Apple-Catalina-Release-Build", "type": "Build", "builddir": "catalina-release",
+                    { "name": "Apple-Catalina-Release-Build", "factory": "BuildFactory", "builddir": "catalina-release",
                       "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
                       "triggers": ["catalina-release-tests-test262", "catalina-release-tests-jsc", "catalina-release-perf-tests", "catalina-release-tests-wk1", "catalina-release-tests-wk2", "catalina-release-tests-wk2-webgl"],
                       "slavenames": ["bot683", "bot674"]
                     },
-                    { "name": "Apple-Catalina-Release-WK1-Tests", "type": "TestWebKit1AllButJSC", "builddir": "catalina-release-tests-wk1",
+                    { "name": "Apple-Catalina-Release-WK1-Tests", "factory": "TestWebKit1AllButJSCFactory", "builddir": "catalina-release-tests-wk1",
                       "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot245", "bot246"]
                     },
-                    { "name": "Apple-Catalina-Release-WK2-Tests", "type": "TestAllButJSC", "builddir": "catalina-release-tests-wk2",
+                    { "name": "Apple-Catalina-Release-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "catalina-release-tests-wk2",
                       "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot247", "bot248"]
                     },
-                    { "name": "Apple-Catalina-Release-WK2-WebGL-Tests", "type": "TestAllButJSC", "builddir": "catalina-release-tests-wk2-webgl",
+                    { "name": "Apple-Catalina-Release-WK2-WebGL-Tests", "factory": "TestAllButJSCFactory", "builddir": "catalina-release-tests-wk2-webgl",
                       "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures", "--webgl-test-suite"],
                       "slavenames": ["bot302"]
                     },
-                    { "name": "Apple-Catalina-Debug-JSC-Tests", "type": "TestJSC", "builddir": "catalina-debug-tests-jsc",
+                    { "name": "Apple-Catalina-Debug-JSC-Tests", "factory": "TestJSCFactory", "builddir": "catalina-debug-tests-jsc",
                       "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["bot638"]
                     },
-                    { "name": "Apple-Catalina-Release-JSC-Tests", "type": "TestJSC", "builddir": "catalina-release-tests-jsc",
+                    { "name": "Apple-Catalina-Release-JSC-Tests", "factory": "TestJSCFactory", "builddir": "catalina-release-tests-jsc",
                       "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["bot157"]
                     },
-                    { "name": "Apple-Catalina-LLINT-CLoop-BuildAndTest", "type": "BuildAndTestLLINTCLoop", "builddir": "catalina-cloop-debug",
+                    { "name": "Apple-Catalina-LLINT-CLoop-BuildAndTest", "factory": "BuildAndTestLLINTCLoopFactory", "builddir": "catalina-cloop-debug",
                       "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["bot187"]
                     },
-                    { "name": "Apple-Catalina-Debug-Test262-Tests", "type": "Test262", "builddir": "catalina-debug-tests-test262",
+                    { "name": "Apple-Catalina-Debug-Test262-Tests", "factory": "Test262Factory", "builddir": "catalina-debug-tests-test262",
                       "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["bot603"]
                     },
                     {
-                      "name": "Apple-Catalina-Release-WK2-Perf", "type": "DownloadAndPerfTest", "builddir": "catalina-release-perf-tests",
+                      "name": "Apple-Catalina-Release-WK2-Perf", "factory": "DownloadAndPerfTestFactory", "builddir": "catalina-release-perf-tests",
                       "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["bot205"]
                     },
-                    { "name": "Apple-Catalina-Release-Test262-Tests", "type": "Test262", "builddir": "catalina-release-tests-test262",
+                    { "name": "Apple-Catalina-Release-Test262-Tests", "factory": "Test262Factory", "builddir": "catalina-release-tests-test262",
                       "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["bot632"]
                     },
-                    { "name": "Apple Mojave Debug (Build)", "type": "Build", "builddir": "mojave-debug",
+                    { "name": "Apple Mojave Debug (Build)", "factory": "BuildFactory", "builddir": "mojave-debug",
                       "platform": "mac-mojave", "configuration": "debug", "architectures": ["x86_64"],
                       "triggers": ["mojave-debug-tests-wk1", "mojave-debug-tests-wk2"],
                       "slavenames": ["bot612", "bot613"]
                     },
-                    { "name": "Apple Mojave Debug WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "mojave-debug-tests-wk1",
+                    { "name": "Apple Mojave Debug WK1 (Tests)", "factory": "TestWebKit1AllButJSCFactory", "builddir": "mojave-debug-tests-wk1",
                       "platform": "mac-mojave", "configuration": "debug", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot183", "bot184"]
                     },
-                    { "name": "Apple Mojave Debug WK2 (Tests)", "type": "TestAllButJSC", "builddir": "mojave-debug-tests-wk2",
+                    { "name": "Apple Mojave Debug WK2 (Tests)", "factory": "TestAllButJSCFactory", "builddir": "mojave-debug-tests-wk2",
                       "platform": "mac-mojave", "configuration": "debug", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot178", "bot179"]
                     },
-                    { "name": "Apple Mojave Release (Build)", "type": "Build", "builddir": "mojave-release",
+                    { "name": "Apple Mojave Release (Build)", "factory": "BuildFactory", "builddir": "mojave-release",
                       "platform": "mac-mojave", "configuration": "release", "architectures": ["x86_64"],
                       "triggers": ["mojave-release-tests-wk1", "mojave-release-tests-wk2"],
                       "slavenames": ["bot610", "bot611"]
                     },
-                    { "name": "Apple Mojave Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "mojave-release-tests-wk1",
+                    { "name": "Apple Mojave Release WK1 (Tests)", "factory": "TestWebKit1AllButJSCFactory", "builddir": "mojave-release-tests-wk1",
                       "platform": "mac-mojave", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot132", "bot185"]
                     },
-                    { "name": "Apple Mojave Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "mojave-release-tests-wk2",
+                    { "name": "Apple Mojave Release WK2 (Tests)", "factory": "TestAllButJSCFactory", "builddir": "mojave-release-tests-wk2",
                       "platform": "mac-mojave", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot198", "bot210"]
                     },
                     {
-                      "name": "Apple-iOS-14-Release-Build", "type": "Build", "builddir": "ios-14-release",
+                      "name": "Apple-iOS-14-Release-Build", "factory": "BuildFactory", "builddir": "ios-14-release",
                       "platform": "ios-14", "configuration": "release", "architectures": ["arm64"],
                       "slavenames": ["bot673"]
                     },
                     {
-                      "name": "Apple-iOS-14-Simulator-Release-Build", "type": "Build", "builddir": "ios-simulator-14-release",
+                      "name": "Apple-iOS-14-Simulator-Release-Build", "factory": "BuildFactory", "builddir": "ios-simulator-14-release",
                       "platform": "ios-simulator-14", "configuration": "release", "architectures": ["x86_64"],
                       "triggers": ["ios-simulator-14-release-tests-wk2", "ipados-simulator-14-release-tests-wk2"],
                       "slavenames": ["bot641", "bot682"]
                     },
                     {
-                      "name": "Apple-iOS-14-Simulator-Debug-Build", "type": "Build", "builddir": "ios-simulator-14-debug",
+                      "name": "Apple-iOS-14-Simulator-Debug-Build", "factory": "BuildFactory", "builddir": "ios-simulator-14-debug",
                       "platform": "ios-simulator-14", "configuration": "debug", "architectures": ["x86_64"],
                       "triggers": ["ios-simulator-14-debug-tests-wk2", "ipados-simulator-14-debug-tests-wk2"],
                       "slavenames": ["bot694", "bot695"]
                     },
                     {
-                      "name": "Apple-iOS-14-Simulator-Release-WK2-Tests", "type": "TestAllButJSC", "builddir": "ios-simulator-14-release-tests-wk2",
+                      "name": "Apple-iOS-14-Simulator-Release-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "ios-simulator-14-release-tests-wk2",
                       "platform": "ios-simulator-14", "configuration": "release", "architectures": ["x86_64"], "device_model": "iphone",
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot651", "bot652"]
                     },
                     {
-                      "name": "Apple-iOS-14-Simulator-Debug-WK2-Tests", "type": "TestAllButJSC", "builddir": "ios-simulator-14-debug-tests-wk2",
+                      "name": "Apple-iOS-14-Simulator-Debug-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "ios-simulator-14-debug-tests-wk2",
                       "platform": "ios-simulator-14", "configuration": "debug", "architectures": ["x86_64"], "device_model": "iphone",
                       "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
                       "slavenames": ["bot653", "bot654"]
                     },
                     {
-                      "name": "Apple-iPadOS-14-Simulator-Release-WK2-Tests", "type": "TestAllButJSC", "builddir": "ipados-simulator-14-release-tests-wk2",
+                      "name": "Apple-iPadOS-14-Simulator-Release-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "ipados-simulator-14-release-tests-wk2",
                       "platform": "ios-simulator-14", "configuration": "release", "architectures": ["x86_64"], "device_model": "ipad",
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot667"]
                     },
                     {
-                      "name": "Apple-iPadOS-14-Simulator-Debug-WK2-Tests", "type": "TestAllButJSC", "builddir": "ipados-simulator-14-debug-tests-wk2",
+                      "name": "Apple-iPadOS-14-Simulator-Debug-WK2-Tests", "factory": "TestAllButJSCFactory", "builddir": "ipados-simulator-14-debug-tests-wk2",
                       "platform": "ios-simulator-14", "configuration": "debug", "architectures": ["x86_64"], "device_model": "ipad",
                       "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
                       "slavenames": ["bot664"]
                     },
                     {
-                      "name": "Apple-tvOS-14-Release-Build", "type": "Build", "builddir": "tvos-14-release",
+                      "name": "Apple-tvOS-14-Release-Build", "factory": "BuildFactory", "builddir": "tvos-14-release",
                       "platform": "tvos-14", "configuration": "release", "architectures": ["arm64"],
                       "slavenames": ["bot607"]
                     },
                     {
-                      "name": "Apple-tvOS-Simulator-14-Release-Build", "type": "Build", "builddir": "tvos-simulator-14-release",
+                      "name": "Apple-tvOS-Simulator-14-Release-Build", "factory": "BuildFactory", "builddir": "tvos-simulator-14-release",
                       "platform": "tvos-simulator-14", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["bot608"]
                     },
                     {
-                      "name": "Apple-watchOS-7-Release-Build", "type": "Build", "builddir": "watchos-7-release",
+                      "name": "Apple-watchOS-7-Release-Build", "factory": "BuildFactory", "builddir": "watchos-7-release",
                       "platform": "watchos-7", "configuration": "release", "architectures": ["arm64_32", "armv7k"],
                       "slavenames": ["bot609"]
                     },
                     {
-                      "name": "Apple-watchOS-Simulator-7-Release-Build", "type": "Build", "builddir": "watchos-simulator-7-release",
+                      "name": "Apple-watchOS-Simulator-7-Release-Build", "factory": "BuildFactory", "builddir": "watchos-simulator-7-release",
                       "platform": "watchos-simulator-7", "configuration": "release", "architectures": ["i386"],
                       "slavenames": ["bot672"]
                     },
                     {
-                      "name": "Apple Win 10 Release (Build)", "type": "Build", "builddir": "win10-release",
+                      "name": "Apple Win 10 Release (Build)", "factory": "BuildFactory", "builddir": "win10-release",
                       "platform": "win", "configuration": "release", "architectures": ["x86_64"],
                       "triggers": ["win10-release-tests"],
                       "slavenames": ["bot548"]
                     },
                     {
-                      "name": "Apple Win 10 Debug (Build)", "type": "Build", "builddir": "win10-debug",
+                      "name": "Apple Win 10 Debug (Build)", "factory": "BuildFactory", "builddir": "win10-debug",
                       "platform": "win", "configuration": "debug", "architectures": ["x86_64"],
                       "triggers": ["win10-debug-tests"],
                       "slavenames": ["bot547"]
                     },
                     {
-                      "name": "Apple Win 10 Release (Tests)", "type": "TestWebKit1", "builddir": "win10-release-tests",
+                      "name": "Apple Win 10 Release (Tests)", "factory": "TestWebKit1Factory", "builddir": "win10-release-tests",
                       "platform": "win", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["bot546"]
                     },
                     {
-                      "name": "Apple Win 10 Debug (Tests)", "type": "TestWebKit1", "builddir": "win10-debug-tests",
+                      "name": "Apple Win 10 Debug (Tests)", "factory": "TestWebKit1Factory", "builddir": "win10-debug-tests",
                       "platform": "win", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["bot545"]
                     },
                     {
-                      "name": "GTK Linux 64-bit Release (Build)", "type": "Build", "builddir": "gtk-linux-64-release",
+                      "name": "GTK Linux 64-bit Release (Build)", "factory": "BuildFactory", "builddir": "gtk-linux-64-release",
                       "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
                       "triggers": ["gtk-linux-64-release-tests", "gtk-linux-64-release-tests-js", "gtk-linux-64-release-tests-webdriver",
                                    "gtk-linux-64-release-wayland-tests", "gtk-linux-64-release-perf-tests"],
@@ -299,179 +299,179 @@
                       "slavenames": ["gtk-linux-slave-2"]
                     },
                     {
-                      "name": "GTK Linux 64-bit Release (Tests)", "type": "TestAllButJSC", "builddir": "gtk-linux-64-release-tests",
+                      "name": "GTK Linux 64-bit Release (Tests)", "factory": "TestAllButJSCFactory", "builddir": "gtk-linux-64-release-tests",
                       "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["gtk-linux-slave-6"]
                     },
                     {
-                      "name": "GTK Linux 64-bit Release (Tests JS)", "type": "TestJS", "builddir": "gtk-linux-64-release-tests-js",
+                      "name": "GTK Linux 64-bit Release (Tests JS)", "factory": "TestJSFactory", "builddir": "gtk-linux-64-release-tests-js",
                       "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["gtk-linux-bot-12"]
                     },
                     {
-                      "name": "GTK Linux 64-bit Release (Tests WebDriver)", "type": "TestWebDriver", "builddir": "gtk-linux-64-release-tests-webdriver",
+                      "name": "GTK Linux 64-bit Release (Tests WebDriver)", "factory": "TestWebDriverFactory", "builddir": "gtk-linux-64-release-tests-webdriver",
                       "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["gtk-linux-bot-14"]
                     },
                     {
-                      "name": "GTK Linux 64-bit Debug (Build)", "type": "Build", "builddir": "gtk-linux-64-debug",
+                      "name": "GTK Linux 64-bit Debug (Build)", "factory": "BuildFactory", "builddir": "gtk-linux-64-debug",
                       "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
                       "triggers": ["gtk-linux-64-debug-tests", "gtk-linux-64-debug-tests-js", "gtk-linux-64-debug-tests-webdriver"],
                       "slavenames": ["gtk-linux-slave-3"]
                     },
                     {
-                      "name": "GTK Linux 64-bit Debug (Tests)", "type": "TestAllButJSC", "builddir": "gtk-linux-64-debug-tests",
+                      "name": "GTK Linux 64-bit Debug (Tests)", "factory": "TestAllButJSCFactory", "builddir": "gtk-linux-64-debug-tests",
                       "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["gtk-linux-slave-7"]
                     },
                     {
-                      "name": "GTK Linux 64-bit Debug (Tests JS)", "type": "TestJS", "builddir": "gtk-linux-64-debug-tests-js",
+                      "name": "GTK Linux 64-bit Debug (Tests JS)", "factory": "TestJSFactory", "builddir": "gtk-linux-64-debug-tests-js",
                       "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["gtk-linux-bot-13"]
                     },
                     {
-                      "name": "GTK Linux 64-bit Debug (Tests WebDriver)", "type": "TestWebDriver", "builddir": "gtk-linux-64-debug-tests-webdriver",
+                      "name": "GTK Linux 64-bit Debug (Tests WebDriver)", "factory": "TestWebDriverFactory", "builddir": "gtk-linux-64-debug-tests-webdriver",
                       "platform": "gtk", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["gtk-linux-bot-15"]
                     },
                     {
-                      "name": "GTK Linux 64-bit Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "gtk-linux-64-release-perf-tests",
+                      "name": "GTK Linux 64-bit Release (Perf)", "factory": "DownloadAndPerfTestFactory", "builddir": "gtk-linux-64-release-perf-tests",
                       "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--display-server=xorg"],
                       "slavenames": ["gtk-linux-slave-8"]
                     },
                     {
-                      "name": "GTK Linux 64-bit Release Wayland (Tests)", "type": "TestAllButJSC", "builddir": "gtk-linux-64-release-wayland-tests",
+                      "name": "GTK Linux 64-bit Release Wayland (Tests)", "factory": "TestAllButJSCFactory", "builddir": "gtk-linux-64-release-wayland-tests",
                       "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--display-server=wayland"],
                       "slavenames": ["gtk-linux-slave-9"]
                     },
                     {
-                      "name": "GTK Linux 64-bit Release Debian Stable (Build)", "type": "Build", "builddir": "gtk-linux-64-release-debian",
+                      "name": "GTK Linux 64-bit Release Debian Stable (Build)", "factory": "BuildFactory", "builddir": "gtk-linux-64-release-debian",
                       "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-experimental-features", "--no-media-source"],
                       "slavenames": ["gtk-linux-slave-10"]
                     },
                     {
-                      "name": "GTK Linux 64-bit Release Ubuntu LTS (Build)", "type": "Build", "builddir": "gtk-linux-64-release-ubuntu",
+                      "name": "GTK Linux 64-bit Release Ubuntu LTS (Build)", "factory": "BuildFactory", "builddir": "gtk-linux-64-release-ubuntu",
                       "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-experimental-features", "--no-media-source"],
                       "slavenames": ["gtk-linux-slave-11"]
                     },
                     {
-                      "name": "GTK-Linux-64bit-Release-Packaging-Nightly-Ubuntu1804", "type": "BuildAndGenerateMiniBrowserBundle", "builddir": "gtk-linux-64-packaging-nigthly-ubuntu1804",
+                      "name": "GTK-Linux-64bit-Release-Packaging-Nightly-Ubuntu1804", "factory": "BuildAndGenerateMiniBrowserBundleFactory", "builddir": "gtk-linux-64-packaging-nigthly-ubuntu1804",
                       "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-bubblewrap-sandbox"],
                       "slavenames": ["gtk-linux-bot-16"]
                     },
                     {
-                      "name": "GTK-Linux-64bit-Release-Packaging-Nightly-Ubuntu2004", "type": "BuildAndGenerateMiniBrowserJSCBundle", "builddir": "gtk-linux-64-packaging-nigthly-ubuntu2004",
+                      "name": "GTK-Linux-64bit-Release-Packaging-Nightly-Ubuntu2004", "factory": "BuildAndGenerateMiniBrowserJSCBundleFactory", "builddir": "gtk-linux-64-packaging-nigthly-ubuntu2004",
                       "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-bubblewrap-sandbox"],
                       "slavenames": ["gtk-linux-bot-17"]
                     },
                     {
-                      "name": "WinCairo 64-bit WKL Release (Build)", "type": "Build", "builddir": "wincairo-wkl-release",
+                      "name": "WinCairo 64-bit WKL Release (Build)", "factory": "BuildFactory", "builddir": "wincairo-wkl-release",
                       "platform": "wincairo", "configuration": "release", "architectures": ["x86_64"],
                       "triggers": ["wincairo-wkl-release-tests", "wincairo-jsc-release-tests"],
                       "slavenames": ["wincairo-wkl-release-build-01"]
                     },
                     {
-                      "name": "WinCairo 64-bit WKL Release (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "wincairo-wkl-release-tests",
+                      "name": "WinCairo 64-bit WKL Release (Tests)", "factory": "TestWebKit1AllButJSCFactory", "builddir": "wincairo-wkl-release-tests",
                       "platform": "wincairo", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["wincairo-wkl-release-tests-01", "wincairo-wkl-release-tests-02"]
                     },
                     {
-                      "name": "WinCairo 64-bit JSC Release (Tests)", "type": "TestJSC", "builddir": "wincairo-jsc-release-tests",
+                      "name": "WinCairo 64-bit JSC Release (Tests)", "factory": "TestJSCFactory", "builddir": "wincairo-jsc-release-tests",
                       "platform": "wincairo", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["wincairo-jsc-release-tests-01"]
                     },
                     {
-                      "name": "WinCairo 64-bit WKL Debug (Build)", "type": "Build", "builddir": "wincairo-wkl-debug",
+                      "name": "WinCairo 64-bit WKL Debug (Build)", "factory": "BuildFactory", "builddir": "wincairo-wkl-debug",
                       "platform": "wincairo", "configuration": "debug", "architectures": ["x86_64"],
                       "triggers": ["wincairo-wkl-debug-tests", "wincairo-jsc-debug-tests"],
                       "slavenames": ["wincairo-wkl-debug-build-01"]
                     },
                     {
-                      "name": "WinCairo 64-bit WKL Debug (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "wincairo-wkl-debug-tests",
+                      "name": "WinCairo 64-bit WKL Debug (Tests)", "factory": "TestWebKit1AllButJSCFactory", "builddir": "wincairo-wkl-debug-tests",
                       "platform": "wincairo", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["wincairo-wkl-debug-tests-01", "wincairo-wkl-debug-tests-02"]
                     },
                     {
-                      "name": "WinCairo 64-bit JSC Debug (Tests)", "type": "TestJSC", "builddir": "wincairo-jsc-debug-tests",
+                      "name": "WinCairo 64-bit JSC Debug (Tests)", "factory": "TestJSCFactory", "builddir": "wincairo-jsc-debug-tests",
                       "platform": "wincairo", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["wincairo-jsc-debug-tests-01"]
                     },
                     {
-                      "name": "PlayStation-Debug-Build", "type": "Build", "builddir": "playstation-debug",
+                      "name": "PlayStation-Debug-Build", "factory": "BuildFactory", "builddir": "playstation-debug",
                       "platform": "playstation", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["playstation-debug-build-01"]
                     },
                     {
-                      "name": "PlayStation-Release-Build", "type": "Build", "builddir": "playstation-release",
+                      "name": "PlayStation-Release-Build", "factory": "BuildFactory", "builddir": "playstation-release",
                       "platform": "playstation", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["playstation-release-build-01"]
                     },
                     {
-                      "name": "JSCOnly Linux AArch64 Release", "type": "BuildAndRemoteJSCTests", "builddir": "jsconly-linux-aarch64-release",
+                      "name": "JSCOnly Linux AArch64 Release", "factory": "BuildAndRemoteJSCTestsFactory", "builddir": "jsconly-linux-aarch64-release",
                       "platform": "jsc-only", "configuration": "release", "architectures": ["aarch64"],
                       "slavenames": ["jsconly-linux-igalia-bot-2"]
                     },
                     {
-                      "name": "JSCOnly Linux ARMv7 Thumb2 Release", "type": "BuildAndRemoteJSCTests", "builddir": "jsconly-linux-armv7-thumb2-release",
+                      "name": "JSCOnly Linux ARMv7 Thumb2 Release", "factory": "BuildAndRemoteJSCTestsFactory", "builddir": "jsconly-linux-armv7-thumb2-release",
                       "platform": "jsc-only", "configuration": "release", "architectures": ["armv7"],
                       "slavenames": ["jsconly-linux-igalia-bot-3"]
                     },
                     {
-                      "name": "JSCOnly Linux ARMv7 Thumb2 SoftFP Release", "type": "BuildAndRemoteJSCTests", "builddir": "jsconly-linux-armv7-thumb2-softfp-release",
+                      "name": "JSCOnly Linux ARMv7 Thumb2 SoftFP Release", "factory": "BuildAndRemoteJSCTestsFactory", "builddir": "jsconly-linux-armv7-thumb2-softfp-release",
                       "platform": "jsc-only", "configuration": "release", "architectures": ["armv7"],
                       "slavenames": ["jsconly-linux-igalia-bot-5"]
                     },
                     {
-                      "name": "JSCOnly Linux MIPS32el Release", "type": "BuildAndRemoteJSCTests", "builddir": "jsconly-linux-mips32el-release",
+                      "name": "JSCOnly Linux MIPS32el Release", "factory": "BuildAndRemoteJSCTestsFactory", "builddir": "jsconly-linux-mips32el-release",
                       "platform": "jsc-only", "configuration": "release", "architectures": ["mips"],
                       "slavenames": ["jsconly-linux-igalia-bot-1"]
                     },
                     {
-                      "name": "WPE Linux 64-bit Release (Build)", "type": "Build", "builddir": "wpe-linux-64-release",
+                      "name": "WPE Linux 64-bit Release (Build)", "factory": "BuildFactory", "builddir": "wpe-linux-64-release",
                       "platform": "wpe", "configuration": "release", "architectures": ["x86_64"],
                       "triggers": ["wpe-linux-64-release-tests", "wpe-linux-64-release-tests-js"],
                       "slavenames": ["wpe-linux-bot-1"]
                     },
                     {
-                      "name": "WPE Linux 64-bit Release (Tests)", "type": "TestAllButJSC", "builddir": "wpe-linux-64-release-tests",
+                      "name": "WPE Linux 64-bit Release (Tests)", "factory": "TestAllButJSCFactory", "builddir": "wpe-linux-64-release-tests",
                       "platform": "wpe", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["wpe-linux-bot-2"]
                     },
                     {
-                      "name": "WPE Linux 64-bit Release (Tests JS)", "type": "TestJS", "builddir": "wpe-linux-64-release-tests-js",
+                      "name": "WPE Linux 64-bit Release (Tests JS)", "factory": "TestJSFactory", "builddir": "wpe-linux-64-release-tests-js",
                       "platform": "wpe", "configuration": "release", "architectures": ["x86_64"],
                       "slavenames": ["wpe-linux-bot-5"]
                     },
                     {
-                      "name": "WPE Linux 64-bit Debug (Build)", "type": "Build", "builddir": "wpe-linux-64-debug",
+                      "name": "WPE Linux 64-bit Debug (Build)", "factory": "BuildFactory", "builddir": "wpe-linux-64-debug",
                       "platform": "wpe", "configuration": "debug", "architectures": ["x86_64"],
                       "triggers": ["wpe-linux-64-debug-tests", "wpe-linux-64-debug-tests-js"],
                       "slavenames": ["wpe-linux-bot-3"]
                     },
                     {
-                      "name": "WPE Linux 64-bit Debug (Tests)", "type": "TestAllButJSC", "builddir": "wpe-linux-64-debug-tests",
+                      "name": "WPE Linux 64-bit Debug (Tests)", "factory": "TestAllButJSCFactory", "builddir": "wpe-linux-64-debug-tests",
                       "platform": "wpe", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["wpe-linux-bot-4"]
                     },
                     {
-                      "name": "WPE Linux 64-bit Debug (Tests JS)", "type": "TestJS", "builddir": "wpe-linux-64-debug-tests-js",
+                      "name": "WPE Linux 64-bit Debug (Tests JS)", "factory": "TestJSFactory", "builddir": "wpe-linux-64-debug-tests-js",
                       "platform": "wpe", "configuration": "debug", "architectures": ["x86_64"],
                       "slavenames": ["wpe-linux-bot-6"]
                     },
                     {
-                      "name": "WPE-Linux-64bit-Release-Packaging-Nightly-Ubuntu1804", "type": "BuildAndGenerateMiniBrowserBundle", "builddir": "wpe-linux-64-packaging-nigthly-ubuntu1804",
+                      "name": "WPE-Linux-64bit-Release-Packaging-Nightly-Ubuntu1804", "factory": "BuildAndGenerateMiniBrowserBundleFactory", "builddir": "wpe-linux-64-packaging-nigthly-ubuntu1804",
                       "platform": "wpe", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-bubblewrap-sandbox", "--cmakeargs=-DENABLE_WPE_QT_API=OFF"],
                       "slavenames": ["wpe-linux-bot-7"]
                     },
                     {
-                      "name": "WPE-Linux-64bit-Release-Packaging-Nightly-Ubuntu2004", "type": "BuildAndGenerateMiniBrowserBundle", "builddir": "wpe-linux-64-packaging-nigthly-ubuntu2004",
+                      "name": "WPE-Linux-64bit-Release-Packaging-Nightly-Ubuntu2004", "factory": "BuildAndGenerateMiniBrowserBundleFactory", "builddir": "wpe-linux-64-packaging-nigthly-ubuntu2004",
                       "platform": "wpe", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-bubblewrap-sandbox", "--cmakeargs=-DENABLE_WPE_QT_API=OFF"],
                       "slavenames": ["wpe-linux-bot-8"]

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py (267850 => 267851)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py	2020-10-01 20:22:16 UTC (rev 267850)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py	2020-10-01 20:47:54 UTC (rev 267851)
@@ -98,8 +98,8 @@
 
         platform = builder['platform']
 
-        builderType = builder.pop('type')
-        factory = globals()["%sFactory" % builderType]
+        factoryName = builder.pop('factory')
+        factory = globals()[factoryName]
         factorykwargs = {}
         for key in "platform", "configuration", "architectures", "triggers", "additionalArguments", "SVNMirror", "device_model":
             value = builder.pop(key, None)
@@ -125,7 +125,7 @@
         else:
             builder["category"] = 'misc'
 
-        if (builder['category'] in ('AppleMac', 'AppleWin', 'iOS')) and builderType != 'Build':
+        if (builder['category'] in ('AppleMac', 'AppleWin', 'iOS')) and factoryName != 'BuildFactory':
             builder['nextBuild'] = pickLatestBuild
 
         c['builders'].append(builder)

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig_unittest.py (267850 => 267851)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig_unittest.py	2020-10-01 20:22:16 UTC (rev 267850)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig_unittest.py	2020-10-01 20:47:54 UTC (rev 267851)
@@ -37,7 +37,7 @@
         config = self.get_config()
         valid_builder_keys = ['additionalArguments', 'architectures', 'builddir', 'configuration', 'description',
                               'defaultProperties', 'device_model', 'env', 'factory', 'icon', 'locks', 'name', 'platform', 'properties',
-                              'remotes', 'runTests', 'shortname', 'type', 'tags', 'triggers', 'workernames', 'slavenames', 'workerbuilddir']
+                              'remotes', 'runTests', 'shortname', 'tags', 'triggers', 'workernames', 'slavenames', 'workerbuilddir']
         for builder in config.get('builders', []):
             for key in builder:
                 self.assertTrue(key in valid_builder_keys, 'Unexpected key "{}" for builder {}'.format(key, builder.get('name')))

Modified: trunk/Tools/ChangeLog (267850 => 267851)


--- trunk/Tools/ChangeLog	2020-10-01 20:22:16 UTC (rev 267850)
+++ trunk/Tools/ChangeLog	2020-10-01 20:47:54 UTC (rev 267851)
@@ -1,3 +1,15 @@
+2020-10-01  Aakash Jain  <aakash_j...@apple.com>
+
+        [build.webkit.org] Rename type to factory in config.json
+        https://bugs.webkit.org/show_bug.cgi?id=217127
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json:
+        * BuildSlaveSupport/build.webkit.org-config/loadConfig.py:
+        (loadBuilderConfig):
+        * BuildSlaveSupport/build.webkit.org-config/loadConfig_unittest.py:
+
 2020-10-01  Eric Carlson  <eric.carl...@apple.com>
 
         Prevent media capture unless the application has correct data for system permission prompt

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

Reply via email to