Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/factories.py (252453 => 252454)
--- trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2019-11-14 11:29:14 UTC (rev 252453)
+++ trunk/Tools/BuildSlaveSupport/ews-build/factories.py 2019-11-14 11:44:18 UTC (rev 252454)
@@ -116,8 +116,8 @@
class JSCTestsFactory(Factory):
- def __init__(self, platform, configuration='release', architectures=None, additionalArguments=None, runTests='true', **kwargs):
- Factory.__init__(self, platform=platform, configuration=configuration, architectures=architectures, buildOnly=False, additionalArguments=additionalArguments, checkRelevance=True)
+ def __init__(self, platform, configuration='release', architectures=None, remotes=None, additionalArguments=None, runTests='true', **kwargs):
+ Factory.__init__(self, platform=platform, configuration=configuration, architectures=architectures, buildOnly=False, remotes=remotes, additionalArguments=additionalArguments, checkRelevance=True)
self.addStep(CompileJSC(skipUpload=True))
if runTests.lower() == 'true':
self.addStep(RunJavaScriptCoreTests())
Modified: trunk/Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py (252453 => 252454)
--- trunk/Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py 2019-11-14 11:29:14 UTC (rev 252453)
+++ trunk/Tools/BuildSlaveSupport/ews-build/loadConfig_unittest.py 2019-11-14 11:44:18 UTC (rev 252454)
@@ -40,7 +40,7 @@
config = json.load(open(os.path.join(cwd, 'config.json')))
valid_builder_keys = ['additionalArguments', 'architectures', 'builddir', 'configuration', 'description',
'defaultProperties', 'env', 'factory', 'icon', 'locks', 'name', 'platform', 'properties',
- 'runTests', 'shortname', 'tags', 'triggers', 'workernames', 'workerbuilddir']
+ 'remotes', 'runTests', 'shortname', 'tags', 'triggers', 'workernames', 'workerbuilddir']
for builder in config.get('builders', []):
for key in builder:
self.assertTrue(key in valid_builder_keys, 'Unexpected key "{}" for builder {}'.format(key, builder.get('name')))
Modified: trunk/Tools/ChangeLog (252453 => 252454)
--- trunk/Tools/ChangeLog 2019-11-14 11:29:14 UTC (rev 252453)
+++ trunk/Tools/ChangeLog 2019-11-14 11:44:18 UTC (rev 252454)
@@ -1,5 +1,16 @@
2019-11-14 Aakash Jain <aakash_j...@apple.com>
+ Add support for remotes file for EWS builders (follow-up fix)
+ https://bugs.webkit.org/show_bug.cgi?id=203899
+
+ Unreviewed follow-up fix.
+
+ * BuildSlaveSupport/ews-build/factories.py:
+ (JSCTestsFactory.__init__): Passed remotes parameter to JSCTestsFactory as well.
+ * BuildSlaveSupport/ews-build/loadConfig_unittest.py: Updated unit-test.
+
+2019-11-14 Aakash Jain <aakash_j...@apple.com>
+
[ews] Enable JSC queue on new EWS
https://bugs.webkit.org/show_bug.cgi?id=204179
