Attachment 346981 Details for Bug 188396 – Updated patch

[patch] Updated patch

ews_split_ios_v2.patch (text/plain), 6.07 KB, created by Aakash Jain on 2018-08-11 20:34:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aakash Jain

Created: 2018-08-11 20:34:25 PDT

Size: 6.07 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 234784)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2018-08-11  Aakash Jain  <aakash_jain@apple.com>
>+
>+        [ews-build] Separate queues for Builders and Testers - iOS
>+        https://bugs.webkit.org/show_bug.cgi?id=188396
>+
>+        Reviewed by Lucas Forschler.
>+
>+        * BuildSlaveSupport/ews-build/config.json: Splitted iOS queues into builders and testers.
>+        Also added ews121 and ews122 to match with current EWS configuration.
>+        * BuildSlaveSupport/ews-build/factories.py:
>+        (TestsFactory): Base classes for various Test factories.
>+        (TestsFactory.getProduct): Download and extract the archive.
>+
> 2018-08-10  Daniel Bates  <dabates@apple.com>
> 
>         webkit-patch setup-git-clone should set Git core editor to commit-log-editor
>Index: Tools/BuildSlaveSupport/ews-build/config.json
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/config.json	(revision 234784)
>+++ Tools/BuildSlaveSupport/ews-build/config.json	(working copy)
>@@ -117,6 +117,14 @@
>       "platform": "mac-high-sierra"
>     },
>     {
>+      "name": "ews121",
>+      "platform": "ios-simulator-11"
>+    },
>+    {
>+      "name": "ews122",
>+      "platform": "ios-simulator-11"
>+    },
>+    {
>       "name": "ews123",
>       "platform": "ios-simulator-11"
>     },
>@@ -191,21 +199,29 @@
>       "workernames": ["tanty-gtk-wk2-ews", "ltilve-gtk-wk2-ews"]
>     },
>     {
>-      "name": "iOS-11-EWS",
>-      "factory": "iOSFactory",
>+      "name": "iOS-11-Build-EWS",
>+      "factory": "iOSBuildFactory",
>       "platform": "ios-11",
>       "configuration": "release",
>       "architectures": ["arm64"],
>       "workernames": ["ews108", "ews109"]
>     },
>     {
>-      "name": "iOS-11-Simulator-EWS",
>-      "factory": "iOSSimulatorFactory",
>+      "name": "iOS-11-Simulator-Build-EWS",
>+      "factory": "iOSBuildFactory",
>       "platform": "ios-simulator-11",
>       "configuration": "release",
>       "architectures": ["x86_64"],
>-      "triggers": ["api-tests-ios-sim-ews"],
>-      "workernames": ["ews123", "ews124", "ews125", "ews126"]
>+      "triggers": ["api-tests-ios-sim-ews", "ios-11-sim-tests-ews"],
>+      "workernames": ["ews121", "ews122", "ews123", "ews124", "ews125", "ews126"]
>+    },
>+    {
>+      "name": "iOS-11-Simulator-Tests-EWS",
>+      "factory": "iOSTestsFactory",
>+      "platform": "ios-simulator-11",
>+      "configuration": "release",
>+      "architectures": ["x86_64"],
>+      "workernames": ["ews121", "ews122", "ews123", "ews124", "ews125", "ews126"]
>     },
>     {
>       "name": "macOS-Sierra-Release-WK1-EWS",
>@@ -302,22 +318,29 @@
>       "name": "try",
>       "port": 5555,
>       "builderNames": ["Style-EWS", "JSC-Tests-EWS", "macOS-Sierra-Release-WK1-EWS", "GTK-Webkit2-EWS", "macOS-Sierra-Release-WK2-EWS",
>-                       "macOS-High-Sierra-Release-32bit-WK2-EWS", "WPE-EWS", "Windows-EWS", "iOS-11-EWS", "WinCairo-EWS", "iOS-11-Simulator-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"]
>     },
>     {
>       "type": "Triggerable",
>+      "name": "ios-11-sim-tests-ews",
>+      "builderNames": [
>+        "iOS-11-Simulator-Tests-EWS"
>+      ]
>+    },
>+    {
>+      "type": "Triggerable",
>       "name": "api-tests-ios-sim-ews",
>       "builderNames": [
>         "API-Tests-iOS-Simulator-EWS"
>-      ]     
>+      ]
>     },
>     {
>       "type": "Triggerable",
>       "name": "api-tests-mac-ews",
>       "builderNames": [
>         "API-Tests-macOS-EWS"
>-      ]     
>+      ]
>     }
>   ]
> }
>Index: Tools/BuildSlaveSupport/ews-build/factories.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/factories.py	(revision 234784)
>+++ Tools/BuildSlaveSupport/ews-build/factories.py	(working copy)
>@@ -85,6 +85,23 @@ class BuildFactory(Factory):
>         }
> 
> 
>+class TestFactory(Factory):
>+    LayoutTestClass = None
>+    APITestClass = None
>+
>+    def getProduct(self):
>+        self.addStep(DownloadBuiltProduct())
>+        self.addStep(ExtractBuiltProduct())
>+
>+    def __init__(self, platform, configuration=None, architectures=None, additionalArguments=None, **kwargs):
>+        Factory.__init__(self, platform, configuration, architectures, False, additionalArguments)
>+        self.getProduct()
>+        if self.LayoutTestClass:
>+            self.addStep(self.LayoutTestClass())
>+        if self.APITestClass:
>+            self.addStep(self.APITestClass())
>+
>+
> class JSCTestsFactory(Factory):
>     def __init__(self, platform, configuration='release', architectures=None, additionalArguments=None, **kwargs):
>         Factory.__init__(self, platform, configuration, architectures, False, additionalArguments)
>@@ -98,29 +115,20 @@ class JSCTestsFactory(Factory):
>         self.addStep(RunJavaScriptCoreTestsToT())
> 
> 
>-class APITestsFactory(Factory):
>-    def getProduct(self):
>-        self.addStep(DownloadBuiltProduct())
>-        self.addStep(ExtractBuiltProduct())
>-
>-    def __init__(self, platform, configuration=None, architectures=None, additionalArguments=None, **kwargs):
>-        Factory.__init__(self, platform, configuration, architectures, False, additionalArguments)
>-        self.getProduct()
>-        self.addStep(RunAPITests())
>+class APITestsFactory(TestFactory):
>+    APITestClass = RunAPITests
> 
> 
> class GTKFactory(Factory):
>     pass
> 
> 
>-class iOSFactory(BuildFactory):
>+class iOSBuildFactory(BuildFactory):
>     pass
> 
> 
>-class iOSSimulatorFactory(BuildFactory):
>-    def __init__(self, platform, configuration=None, architectures=None, additionalArguments=None, triggers=None, **kwargs):
>-        BuildFactory.__init__(self, platform, configuration, architectures, additionalArguments, triggers)
>-        self.addStep(RunWebKitTests())
>+class iOSTestsFactory(TestFactory):
>+    LayoutTestClass = RunWebKitTests
> 
> 
> class MacWK1Factory(BuildFactory):

Actions: View | Formatted Diff | Diff

Attachments on bug 188396: 346745 | 346981