Title: [233160] trunk/Tools
- Revision
- 233160
- Author
- aakash_j...@apple.com
- Date
- 2018-06-25 11:52:10 -0700 (Mon, 25 Jun 2018)
Log Message
[ews-build] Add support for try Buildbot try schedulers
https://bugs.webkit.org/show_bug.cgi?id=186948
Reviewed by Lucas Forschler.
* BuildSlaveSupport/ews-build/config.json: Use Try_Userpass scheduler.
* BuildSlaveSupport/ews-build/loadConfig.py: Updated to use try scheduler.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-build/config.json (233159 => 233160)
--- trunk/Tools/BuildSlaveSupport/ews-build/config.json 2018-06-25 18:43:07 UTC (rev 233159)
+++ trunk/Tools/BuildSlaveSupport/ews-build/config.json 2018-06-25 18:52:10 UTC (rev 233160)
@@ -269,9 +269,9 @@
],
"schedulers": [
{
- "type": "AnyBranchScheduler",
- "name": "misc-trigger",
- "treeStableTimer": 0,
+ "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",
"macOS-High-Sierra-Release-32bit-WK2-EWS", "WPE-EWS", "Windows-EWS", "iOS-11-EWS", "WinCairo-EWS", "iOS-11-Simulator-EWS",
"Webkitpy-tests-EWS", "macOS-Sierra-Debug-WK1-EWS", "Bindings-tests-EWS"]
Modified: trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py (233159 => 233160)
--- trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py 2018-06-25 18:43:07 UTC (rev 233159)
+++ trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py 2018-06-25 18:52:10 UTC (rev 233160)
@@ -27,6 +27,7 @@
from buildbot.scheduler import AnyBranchScheduler, Periodic, Dependent, Triggerable, Nightly
from buildbot.schedulers.forcesched import ForceScheduler, WorkerChoiceParameter
+from buildbot.schedulers.trysched import Try_Userpass
from buildbot.worker import Worker
from buildbot.util import identifiers as buildbot_identifiers
@@ -61,12 +62,16 @@
c['schedulers'] = []
for scheduler in config['schedulers']:
- schedulerType = globals()[scheduler.pop('type')]
+ schedulerClassName = scheduler.pop('type')
+ schedulerClass = globals()[schedulerClassName]
# Python 2.6 can't handle unicode keys as keyword arguments:
# http://bugs.python.org/issue2646. Modern versions of json return
# unicode strings from json.load, so we map all keys to str objects.
scheduler = dict(map(lambda key_value_pair: (str(key_value_pair[0]), key_value_pair[1]), scheduler.items()))
- c['schedulers'].append(schedulerType(**scheduler))
+ if (schedulerClassName == 'Try_Userpass'):
+ # FIXME: Read the credentials from local file on disk.
+ scheduler['userpass'] = [('sampleuser', 'samplepass')]
+ c['schedulers'].append(schedulerClass(**scheduler))
force_scheduler = ForceScheduler(name='force-{0}'.format(scheduler['name']),
builderNames=scheduler['builderNames'],
Modified: trunk/Tools/ChangeLog (233159 => 233160)
--- trunk/Tools/ChangeLog 2018-06-25 18:43:07 UTC (rev 233159)
+++ trunk/Tools/ChangeLog 2018-06-25 18:52:10 UTC (rev 233160)
@@ -1,3 +1,13 @@
+2018-06-25 Aakash Jain <aakash_j...@apple.com>
+
+ [ews-build] Add support for try Buildbot try schedulers
+ https://bugs.webkit.org/show_bug.cgi?id=186948
+
+ Reviewed by Lucas Forschler.
+
+ * BuildSlaveSupport/ews-build/config.json: Use Try_Userpass scheduler.
+ * BuildSlaveSupport/ews-build/loadConfig.py: Updated to use try scheduler.
+
2018-06-25 Ross Kirsling <ross.kirsl...@sony.com>
[WinCairo] Unreviewed build fix for r233088.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
