Attachment 347119 Details for Bug 188516 – Updated patch

[patch] Updated patch

ews_split_mac_sierra_release_v2.patch (text/plain), 4.47 KB, created by Aakash Jain on 2018-08-14 15:55:39 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aakash Jain

Created: 2018-08-14 15:55:39 PDT

Size: 4.47 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 234799)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2018-08-13  Aakash Jain  <aakash_jain@apple.com>
>+
>+        [ews-build] Separate queues for Builders and Testers - macOS Sierra
>+        https://bugs.webkit.org/show_bug.cgi?id=188516
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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-12  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Float prev/next sibling should prevent top/bottom margin collapsing with parent.
>Index: Tools/BuildSlaveSupport/ews-build/config.json
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/config.json	(revision 234861)
>+++ Tools/BuildSlaveSupport/ews-build/config.json	(working copy)
>@@ -224,17 +224,25 @@
>       "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"],
>@@ -242,7 +250,7 @@
>     },
>     {
>       "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"
>Index: Tools/BuildSlaveSupport/ews-build/factories.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/factories.py	(revision 234861)
>+++ Tools/BuildSlaveSupport/ews-build/factories.py	(working copy)
>@@ -131,12 +131,16 @@ class iOSTestsFactory(TestFactory):
>     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):

Actions: View | Formatted Diff | Diff

Attachments on bug 188516: 347013 | 347119