[webkit-changes] [250981] trunk/Tools

Thu, 10 Oct 2019 11:45:42 -0700

Title: [250981] trunk/Tools
Revision
250981
Author
[email protected]
Date
2019-10-10 11:44:51 -0700 (Thu, 10 Oct 2019)

Log Message

Updated new Catalina queues names as per new Buildbot naming scheme
https://bugs.webkit.org/show_bug.cgi?id=202816

Reviewed by Jonathan Bedard.

* BuildSlaveSupport/build.webkit.org-config/config.json: Renamed builder name and removed spaces.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js: Ditto.
* BuildSlaveSupport/build.webkit.org-config/steps_unittest.py: Ditto.

Modified Paths

Diff

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


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2019-10-10 18:42:17 UTC (rev 250980)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json	2019-10-10 18:44:51 UTC (rev 250981)
@@ -99,37 +99,37 @@
                   ],
 
     "builders":   [ 
-                    { "name": "Apple Catalina Debug (Build)", "type": "Build", "builddir": "catalina-debug",
+                    { "name": "Apple-Catalina-Debug-Build", "type": "Build", "builddir": "catalina-debug",
                       "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
                       "triggers": ["catalina-debug-tests-wk1", "catalina-debug-tests-wk2"],
                       "slavenames": ["bot687", "bot688"]
                     },
-                    { "name": "Apple Catalina Debug WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "catalina-debug-tests-wk1",
+                    { "name": "Apple-Catalina-Debug-WK1-Tests", "type": "TestWebKit1AllButJSC", "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", "type": "TestAllButJSC", "builddir": "catalina-debug-tests-wk2",
                       "platform": "mac-catalina", "configuration": "debug", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot243", "bot244"]
                     },
-                    { "name": "Apple Catalina Release (Build)", "type": "Build", "builddir": "catalina-release",
+                    { "name": "Apple-Catalina-Release-Build", "type": "Build", "builddir": "catalina-release",
                       "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
                       "triggers": ["catalina-release-tests-wk1", "catalina-release-tests-wk2", "catalina-leaks"],
                       "slavenames": ["bot683", "bot674"]
                     },
-                    { "name": "Apple Catalina Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "catalina-release-tests-wk1",
+                    { "name": "Apple-Catalina-Release-WK1-Tests", "type": "TestWebKit1AllButJSC", "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", "type": "TestAllButJSC", "builddir": "catalina-release-tests-wk2",
                       "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures"],
                       "slavenames": ["bot247", "bot248"]
                     },
-                    { "name": "Apple Catalina (Leaks)", "type": "TestWebKit1Leaks", "builddir": "catalina-leaks",
+                    { "name": "Apple-Catalina-Leaks", "type": "TestWebKit1Leaks", "builddir": "catalina-leaks",
                       "platform": "mac-catalina", "configuration": "release", "architectures": ["x86_64"],
                       "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
                       "slavenames": ["bot121"]
@@ -424,22 +424,22 @@
                                        "WPE Linux 64-bit Release (Build)", "WPE Linux 64-bit Debug (Build)"]
                     },
                     { "type": "PlatformSpecificScheduler", "platform": "mac-catalina", "branch": "trunk", "treeStableTimer": 45.0,
-                      "builderNames": ["Apple Catalina Release (Build)", "Apple Catalina Debug (Build)"]
+                      "builderNames": ["Apple-Catalina-Release-Build", "Apple-Catalina-Debug-Build"]
                     },
                     { "type": "Triggerable", "name": "catalina-release-tests-wk1",
-                      "builderNames": ["Apple Catalina Release WK1 (Tests)"]
+                      "builderNames": ["Apple-Catalina-Release-WK1-Tests"]
                     },
                     { "type": "Triggerable", "name": "catalina-release-tests-wk2",
-                      "builderNames": ["Apple Catalina Release WK2 (Tests)"]
+                      "builderNames": ["Apple-Catalina-Release-WK2-Tests"]
                     },
                     { "type": "Triggerable", "name": "catalina-debug-tests-wk1",
-                      "builderNames": ["Apple Catalina Debug WK1 (Tests)"]
+                      "builderNames": ["Apple-Catalina-Debug-WK1-Tests"]
                     },
                     { "type": "Triggerable", "name": "catalina-debug-tests-wk2",
-                      "builderNames": ["Apple Catalina Debug WK2 (Tests)"]
+                      "builderNames": ["Apple-Catalina-Debug-WK2-Tests"]
                     },
                     { "type": "Triggerable", "name": "catalina-leaks",
-                      "builderNames": ["Apple Catalina (Leaks)"]
+                      "builderNames": ["Apple-Catalina-Leaks"]
                     },
                     { "type": "PlatformSpecificScheduler", "platform": "mac-mojave", "branch": "trunk", "treeStableTimer": 45.0,
                       "builderNames": ["Apple Mojave Release (Build)", "Apple Mojave Debug (Build)"]

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js (250980 => 250981)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js	2019-10-10 18:42:17 UTC (rev 250980)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js	2019-10-10 18:44:51 UTC (rev 250981)
@@ -26,13 +26,13 @@
 WebKitBuildbot = function()
 {
     const queueInfo = {
-        "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},
-        "Apple Catalina Debug WK2 (Tests)": {platform: Dashboard.Platform.macOSCatalina, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
-        "Apple Catalina Release WK1 (Tests)": {platform: Dashboard.Platform.macOSCatalina, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
-        "Apple Catalina Release WK2 (Tests)": {platform: Dashboard.Platform.macOSCatalina, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
-        "Apple Catalina (Leaks)": {platform: Dashboard.Platform.macOSCatalina, debug: false, leaks: true},
+        "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},
+        "Apple-Catalina-Debug-WK2-Tests": {platform: Dashboard.Platform.macOSCatalina, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+        "Apple-Catalina-Release-WK1-Tests": {platform: Dashboard.Platform.macOSCatalina, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit1},
+        "Apple-Catalina-Release-WK2-Tests": {platform: Dashboard.Platform.macOSCatalina, debug: false, tester: true, testCategory: Buildbot.TestCategory.WebKit2},
+        "Apple-Catalina-Leaks": {platform: Dashboard.Platform.macOSCatalina, debug: false, leaks: true},
         "Apple Mojave Debug (Build)": {platform: Dashboard.Platform.macOSMojave, debug: true, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
         "Apple Mojave Release (Build)": {platform: Dashboard.Platform.macOSMojave, debug: false, builder: true, architecture: Buildbot.BuildArchitecture.SixtyFourBit},
         "Apple Mojave Debug WK1 (Tests)": {platform: Dashboard.Platform.macOSMojave, debug: true, tester: true, testCategory: Buildbot.TestCategory.WebKit1},

Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py (250980 => 250981)


--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py	2019-10-10 18:42:17 UTC (rev 250980)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py	2019-10-10 18:44:51 UTC (rev 250981)
@@ -527,13 +527,13 @@
     'Apple Win 10 Debug (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile', 'compile-webkit', 'archive-built-product', 'upload', 'transfer-to-s3', 'trigger'],
     'Apple Win 10 Release (Build)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'compile', 'compile-webkit', 'archive-built-product', 'upload', 'transfer-to-s3', 'trigger'],
 
-    'Apple Catalina Debug (Build)': ['configure build', 'svn', '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 Catalina Debug WK1 (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
-    'Apple Catalina Debug WK2 (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
-    'Apple Catalina Release (Build)': ['configure build', 'svn', '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 Catalina Release WK1 (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
-    'Apple Catalina Release WK2 (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
-    'Apple Catalina (Leaks)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'archive-test-results', 'upload', 'MasterShellCommand'],
+    'Apple-Catalina-Debug-Build': ['configure build', 'svn', '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-Catalina-Debug-WK1-Tests': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
+    'Apple-Catalina-Debug-WK2-Tests': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
+    'Apple-Catalina-Release-Build': ['configure build', 'svn', '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-Catalina-Release-WK1-Tests': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
+    'Apple-Catalina-Release-WK2-Tests': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],
+    'Apple-Catalina-Leaks': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'archive-test-results', 'upload', 'MasterShellCommand'],
 
     'Apple Mojave Debug (Build)': ['configure build', 'svn', '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 Mojave Debug WK1 (Tests)': ['configure build', 'svn', 'kill old processes', 'delete WebKitBuild directory', 'delete stale build files', 'download-built-product', 'extract-built-product', 'layout-test', 'run-api-tests', 'webkitpy-test', 'webkitperl-test', 'bindings-generation-tests', 'builtins-generator-tests', 'dashboard-tests', 'archive-test-results', 'upload', 'MasterShellCommand'],

Modified: trunk/Tools/ChangeLog (250980 => 250981)


--- trunk/Tools/ChangeLog	2019-10-10 18:42:17 UTC (rev 250980)
+++ trunk/Tools/ChangeLog	2019-10-10 18:44:51 UTC (rev 250981)
@@ -1,3 +1,14 @@
+2019-10-10  Aakash Jain  <[email protected]>
+
+        Updated new Catalina queues names as per new Buildbot naming scheme
+        https://bugs.webkit.org/show_bug.cgi?id=202816
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/build.webkit.org-config/config.json: Renamed builder name and removed spaces.
+        * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/WebKitBuildbot.js: Ditto.
+        * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py: Ditto.
+
 2019-10-10  Matt Lewis  <[email protected]>
 
         Fixing build scheduling for Catalina queues.

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

Reply via email to