<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[234785] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/234785">234785</a></dd>
<dt>Author</dt> <dd>aakash_jain@apple.com</dd>
<dt>Date</dt> <dd>2018-08-11 21:13:52 -0700 (Sat, 11 Aug 2018)</dd>
</dl>

<h3>Log Message</h3>
<pre>[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.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportewsbuildconfigjson">trunk/Tools/BuildSlaveSupport/ews-build/config.json</a></li>
<li><a href="#trunkToolsBuildSlaveSupportewsbuildfactoriespy">trunk/Tools/BuildSlaveSupport/ews-build/factories.py</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportewsbuildconfigjson"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/ews-build/config.json (234784 => 234785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/ews-build/config.json      2018-08-11 21:04:12 UTC (rev 234784)
+++ trunk/Tools/BuildSlaveSupport/ews-build/config.json 2018-08-12 04:13:52 UTC (rev 234785)
</span><span class="lines">@@ -117,6 +117,14 @@
</span><span class="cx">       "platform": "mac-high-sierra"
</span><span class="cx">     },
</span><span class="cx">     {
</span><ins>+      "name": "ews121",
+      "platform": "ios-simulator-11"
+    },
+    {
+      "name": "ews122",
+      "platform": "ios-simulator-11"
+    },
+    {
</ins><span class="cx">       "name": "ews123",
</span><span class="cx">       "platform": "ios-simulator-11"
</span><span class="cx">     },
</span><span class="lines">@@ -191,8 +199,8 @@
</span><span class="cx">       "workernames": ["tanty-gtk-wk2-ews", "ltilve-gtk-wk2-ews"]
</span><span class="cx">     },
</span><span class="cx">     {
</span><del>-      "name": "iOS-11-EWS",
-      "factory": "iOSFactory",
</del><ins>+      "name": "iOS-11-Build-EWS",
+      "factory": "iOSBuildFactory",
</ins><span class="cx">       "platform": "ios-11",
</span><span class="cx">       "configuration": "release",
</span><span class="cx">       "architectures": ["arm64"],
</span><span class="lines">@@ -199,15 +207,23 @@
</span><span class="cx">       "workernames": ["ews108", "ews109"]
</span><span class="cx">     },
</span><span class="cx">     {
</span><del>-      "name": "iOS-11-Simulator-EWS",
-      "factory": "iOSSimulatorFactory",
</del><ins>+      "name": "iOS-11-Simulator-Build-EWS",
+      "factory": "iOSBuildFactory",
</ins><span class="cx">       "platform": "ios-simulator-11",
</span><span class="cx">       "configuration": "release",
</span><span class="cx">       "architectures": ["x86_64"],
</span><del>-      "triggers": ["api-tests-ios-sim-ews"],
-      "workernames": ["ews123", "ews124", "ews125", "ews126"]
</del><ins>+      "triggers": ["api-tests-ios-sim-ews", "ios-11-sim-tests-ews"],
+      "workernames": ["ews121", "ews122", "ews123", "ews124", "ews125", "ews126"]
</ins><span class="cx">     },
</span><span class="cx">     {
</span><ins>+      "name": "iOS-11-Simulator-Tests-EWS",
+      "factory": "iOSTestsFactory",
+      "platform": "ios-simulator-11",
+      "configuration": "release",
+      "architectures": ["x86_64"],
+      "workernames": ["ews121", "ews122", "ews123", "ews124", "ews125", "ews126"]
+    },
+    {
</ins><span class="cx">       "name": "macOS-Sierra-Release-WK1-EWS",
</span><span class="cx">       "factory": "MacWK1Factory",
</span><span class="cx">       "platform": "mac-sierra",
</span><span class="lines">@@ -302,15 +318,22 @@
</span><span class="cx">       "name": "try",
</span><span class="cx">       "port": 5555,
</span><span class="cx">       "builderNames": ["Style-EWS", "JSC-Tests-EWS", "macOS-Sierra-Release-WK1-EWS", "GTK-Webkit2-EWS", "macOS-Sierra-Release-WK2-EWS",
</span><del>-                       "macOS-High-Sierra-Release-32bit-WK2-EWS", "WPE-EWS", "Windows-EWS", "iOS-11-EWS", "WinCairo-EWS", "iOS-11-Simulator-EWS",
</del><ins>+                       "macOS-High-Sierra-Release-32bit-WK2-EWS", "WPE-EWS", "Windows-EWS", "iOS-11-Build-EWS", "WinCairo-EWS", "iOS-11-Simulator-Build-EWS",
</ins><span class="cx">                        "WebKitPy-Tests-EWS", "WebKitPerl-Tests-EWS", "macOS-Sierra-Debug-WK1-EWS", "Bindings-Tests-EWS"]
</span><span class="cx">     },
</span><span class="cx">     {
</span><span class="cx">       "type": "Triggerable",
</span><ins>+      "name": "ios-11-sim-tests-ews",
+      "builderNames": [
+        "iOS-11-Simulator-Tests-EWS"
+      ]
+    },
+    {
+      "type": "Triggerable",
</ins><span class="cx">       "name": "api-tests-ios-sim-ews",
</span><span class="cx">       "builderNames": [
</span><span class="cx">         "API-Tests-iOS-Simulator-EWS"
</span><del>-      ]     
</del><ins>+      ]
</ins><span class="cx">     },
</span><span class="cx">     {
</span><span class="cx">       "type": "Triggerable",
</span><span class="lines">@@ -317,7 +340,7 @@
</span><span class="cx">       "name": "api-tests-mac-ews",
</span><span class="cx">       "builderNames": [
</span><span class="cx">         "API-Tests-macOS-EWS"
</span><del>-      ]     
</del><ins>+      ]
</ins><span class="cx">     }
</span><span class="cx">   ]
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportewsbuildfactoriespy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories.py (234784 => 234785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/ews-build/factories.py     2018-08-11 21:04:12 UTC (rev 234784)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py        2018-08-12 04:13:52 UTC (rev 234785)
</span><span class="lines">@@ -85,6 +85,23 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+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())
+
+
</ins><span class="cx"> class JSCTestsFactory(Factory):
</span><span class="cx">     def __init__(self, platform, configuration='release', architectures=None, additionalArguments=None, **kwargs):
</span><span class="cx">         Factory.__init__(self, platform, configuration, architectures, False, additionalArguments)
</span><span class="lines">@@ -98,29 +115,20 @@
</span><span class="cx">         self.addStep(RunJavaScriptCoreTestsToT())
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-class APITestsFactory(Factory):
-    def getProduct(self):
-        self.addStep(DownloadBuiltProduct())
-        self.addStep(ExtractBuiltProduct())
</del><ins>+class APITestsFactory(TestFactory):
+    APITestClass = RunAPITests
</ins><span class="cx"> 
</span><del>-    def __init__(self, platform, configuration=None, architectures=None, additionalArguments=None, **kwargs):
-        Factory.__init__(self, platform, configuration, architectures, False, additionalArguments)
-        self.getProduct()
-        self.addStep(RunAPITests())
</del><span class="cx"> 
</span><del>-
</del><span class="cx"> class GTKFactory(Factory):
</span><span class="cx">     pass
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-class iOSFactory(BuildFactory):
</del><ins>+class iOSBuildFactory(BuildFactory):
</ins><span class="cx">     pass
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-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())
</del><ins>+class iOSTestsFactory(TestFactory):
+    LayoutTestClass = RunWebKitTests
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class MacWK1Factory(BuildFactory):
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (234784 => 234785)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2018-08-11 21:04:12 UTC (rev 234784)
+++ trunk/Tools/ChangeLog       2018-08-12 04:13:52 UTC (rev 234785)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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.
+
</ins><span class="cx"> 2018-08-10  Daniel Bates  <dabates@apple.com>
</span><span class="cx"> 
</span><span class="cx">         webkit-patch setup-git-clone should set Git core editor to commit-log-editor
</span></span></pre>
</div>
</div>

</body>
</html>