Title: [234951] trunk/Tools
Revision
234951
Author
aakash_j...@apple.com
Date
2018-08-16 13:40:15 -0700 (Thu, 16 Aug 2018)

Log Message

[ews-build] Separate queues for Builders and Testers - macOS Sierra
https://bugs.webkit.org/show_bug.cgi?id=188516

Reviewed by Lucas Forschler.

* BuildSlaveSupport/ews-build/config.json: Splitted macOS Sierra Release queues into builders and testers.
* BuildSlaveSupport/ews-build/factories.py: Used appropriate base classes for builders and testers.

Modified Paths

Diff

Modified: trunk/Tools/BuildSlaveSupport/ews-build/config.json (234950 => 234951)


--- trunk/Tools/BuildSlaveSupport/ews-build/config.json	2018-08-16 20:15:32 UTC (rev 234950)
+++ trunk/Tools/BuildSlaveSupport/ews-build/config.json	2018-08-16 20:40:15 UTC (rev 234951)
@@ -224,25 +224,33 @@
       "workernames": ["ews121", "ews122", "ews123", "ews124", "ews125", "ews126"]
     },
     {
-      "name": "macOS-Sierra-Release-WK1-EWS",
-      "factory": "MacWK1Factory",
+      "name": "macOS-Sierra-Release-Build-EWS",
+      "factory": "macOSBuildFactory",
       "platform": "mac-sierra",
       "configuration": "release",
       "architectures": ["x86_64"],
-      "triggers": ["api-tests-mac-ews"],
+      "triggers": ["api-tests-mac-ews", "macos-sierra-release-wk1-tests-ews", "macos-sierra-release-wk2-tests-ews"],
       "workernames": ["ews100", "ews101", "ews102", "ews103"]
     },
     {
-      "name": "macOS-Sierra-Release-WK2-EWS",
-      "factory": "MacWK2Factory",
+      "name": "macOS-Sierra-Release-WK1-Tests-EWS",
+      "factory": "macOSWK1Factory",
       "platform": "mac-sierra",
       "configuration": "release",
       "architectures": ["x86_64"],
+      "workernames": ["ews100", "ews101", "ews102", "ews103"]
+    },
+    {
+      "name": "macOS-Sierra-Release-WK2-Tests-EWS",
+      "factory": "macOSWK2Factory",
+      "platform": "mac-sierra",
+      "configuration": "release",
+      "architectures": ["x86_64"],
       "workernames": ["ews104", "ews105", "ews106", "ews107"]
     },
     {
       "name": "macOS-Sierra-Debug-WK1-EWS",
-      "factory": "MacWK1Factory",
+      "factory": "macOSWK1Factory",
       "platform": "mac-sierra",
       "configuration": "debug",
       "architectures": ["x86_64"],
@@ -250,7 +258,7 @@
     },
     {
       "name": "macOS-High-Sierra-Release-32bit-WK2-EWS",
-      "factory": "MacWK2Factory",
+      "factory": "macOSWK2Factory",
       "platform": "mac-high-sierra",
       "configuration": "release",
       "architectures": ["i386"],
@@ -317,7 +325,7 @@
       "type": "Try_Userpass",
       "name": "try",
       "port": 5555,
-      "builderNames": ["Style-EWS", "JSC-Tests-EWS", "macOS-Sierra-Release-WK1-EWS", "GTK-Webkit2-EWS", "macOS-Sierra-Release-WK2-EWS",
+      "builderNames": ["Style-EWS", "JSC-Tests-EWS", "macOS-Sierra-Release-Build-EWS", "GTK-Webkit2-EWS",
                        "macOS-High-Sierra-Release-32bit-WK2-EWS", "WPE-EWS", "Windows-EWS", "iOS-11-Build-EWS", "WinCairo-EWS", "iOS-11-Simulator-Build-EWS",
                        "WebKitPy-Tests-EWS", "WebKitPerl-Tests-EWS", "macOS-Sierra-Debug-WK1-EWS", "Bindings-Tests-EWS"]
     },
@@ -330,6 +338,20 @@
     },
     {
       "type": "Triggerable",
+      "name": "macos-sierra-release-wk1-tests-ews",
+      "builderNames": [
+        "macOS-Sierra-Release-WK1-Tests-EWS"
+      ]
+    },
+    {
+      "type": "Triggerable",
+      "name": "macos-sierra-release-wk2-tests-ews",
+      "builderNames": [
+        "macOS-Sierra-Release-WK2-Tests-EWS"
+      ]
+    },
+    {
+      "type": "Triggerable",
       "name": "api-tests-ios-sim-ews",
       "builderNames": [
         "API-Tests-iOS-Simulator-EWS"

Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories.py (234950 => 234951)


--- trunk/Tools/BuildSlaveSupport/ews-build/factories.py	2018-08-16 20:15:32 UTC (rev 234950)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py	2018-08-16 20:40:15 UTC (rev 234951)
@@ -131,14 +131,18 @@
     LayoutTestClass = RunWebKitTests
 
 
-class MacWK1Factory(BuildFactory):
+class macOSBuildFactory(BuildFactory):
     pass
 
 
-class MacWK2Factory(BuildFactory):
-    pass
+class macOSWK1Factory(TestFactory):
+    LayoutTestClass = RunWebKit1Tests
 
 
+class macOSWK2Factory(TestFactory):
+    LayoutTestClass = RunWebKitTests
+
+
 class WindowsFactory(Factory):
     pass
 

Modified: trunk/Tools/ChangeLog (234950 => 234951)


--- trunk/Tools/ChangeLog	2018-08-16 20:15:32 UTC (rev 234950)
+++ trunk/Tools/ChangeLog	2018-08-16 20:40:15 UTC (rev 234951)
@@ -1,3 +1,13 @@
+2018-08-16  Aakash Jain  <aakash_j...@apple.com>
+
+        [ews-build] Separate queues for Builders and Testers - macOS Sierra
+        https://bugs.webkit.org/show_bug.cgi?id=188516
+
+        Reviewed by Lucas Forschler.
+
+        * BuildSlaveSupport/ews-build/config.json: Splitted macOS Sierra Release queues into builders and testers.
+        * BuildSlaveSupport/ews-build/factories.py: Used appropriate base classes for builders and testers.
+
 2018-08-16  Basuke Suzuki  <basuke.suz...@sony.com>
 
         [Win][DumpRenderTree] Remove error message for duplicated tests.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to