Attachment 343395 Details for Bug 186948 – Proposed patch

[patch] Proposed patch

ews_tryscheduler.patch (text/plain), 3.16 KB, created by Aakash Jain on 2018-06-22 16:45:56 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aakash Jain

Created: 2018-06-22 16:45:56 PDT

Size: 3.16 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 233109)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2018-06-22  Aakash Jain  <aakash_jain@apple.com>
>+
>+        [ews-build] Add support for try Buildbot try schedulers
>+        https://bugs.webkit.org/show_bug.cgi?id=186948
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * BuildSlaveSupport/ews-build/config.json: Use Try_Userpass scheduler.
>+        * BuildSlaveSupport/ews-build/loadConfig.py: Updated to use try scheduler.
>+
> 2018-06-22  Daniel Bates  <dabates@apple.com>
> 
>         Security EWS: bots fails with exception 'NoneType' object has no attribute 'is_closed'
>Index: Tools/BuildSlaveSupport/ews-build/config.json
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/config.json	(revision 233108)
>+++ Tools/BuildSlaveSupport/ews-build/config.json	(working copy)
>@@ -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"]
>Index: Tools/BuildSlaveSupport/ews-build/loadConfig.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/loadConfig.py	(revision 233108)
>+++ Tools/BuildSlaveSupport/ews-build/loadConfig.py	(working copy)
>@@ -27,6 +27,7 @@ import re
> 
> 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,15 @@ def loadBuilderConfig(c, use_localhost_w
> 
>     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'):
>+            scheduler['userpass'] = [('sampleuser', 'samplepass')]
>+        c['schedulers'].append(schedulerClass(**scheduler))
> 
>         force_scheduler = ForceScheduler(name='force-{0}'.format(scheduler['name']),
>                                          builderNames=scheduler['builderNames'],

Actions: View | Formatted Diff | Diff

Attachments on bug 186948: 343395 | 343448