Attachment 343200 Details for Bug 186871 – Proposed patch

[patch] Proposed patch

ews_localhost_worker.patch (text/plain), 2.68 KB, created by Aakash Jain on 2018-06-20 19:31:00 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Aakash Jain

Created: 2018-06-20 19:31:00 PDT

Size: 2.68 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 233028)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2018-06-20  Aakash Jain  <aakash_jain@apple.com>
>+
>+        Add support for using localhost worker in OpenSource EWS Buildbot
>+        https://bugs.webkit.org/show_bug.cgi?id=186871
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * BuildSlaveSupport/ews-build/loadConfig.py:
>+        (loadBuilderConfig): Add a worker named 'local-worker' if use_localhost_worker option is used.
>+        * BuildSlaveSupport/ews-build/master.cfg: Check BUILDBOT_TESTING environment variable and use_localhost_worker if so.
>+
> 2018-06-20  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [WebKit on watchOS] Fixed position elements sometimes flicker when scrolling
>Index: Tools/BuildSlaveSupport/ews-build/loadConfig.py
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/loadConfig.py	(revision 233028)
>+++ Tools/BuildSlaveSupport/ews-build/loadConfig.py	(working copy)
>@@ -34,12 +34,15 @@ BUILDER_NAME_LENGTH_LIMIT = 70
> STEP_NAME_LENGTH_LIMIT = 50
> 
> 
>-def loadBuilderConfig(c):
>+def loadBuilderConfig(c, use_localhost_worker=False):
>     config = json.load(open('config.json'))
>     passwords = json.load(open('passwords.json'))
>     checkWorkersAndBuildersForConsistency(config['workers'], config['builders'])
> 
>     c['workers'] = [Worker(worker['name'], passwords.get(worker['name'], 'password')) for worker in config['workers']]
>+    if use_localhost_worker:
>+        c['workers'].append(Worker('local-worker', 'password', max_builds=2))
>+
>     c['builders'] = []
>     for builder in config['builders']:
>         builder['tags'] = getTagsForBuilder(builder)
>@@ -48,6 +51,10 @@ def loadBuilderConfig(c):
>         del builder['platform']
>         if 'configuration' in builder:
>             del builder['configuration']
>+
>+        if use_localhost_worker:
>+            builder['workernames'].append("local-worker")
>+
>         c['builders'].append(builder)
> 
>     c['schedulers'] = []
>Index: Tools/BuildSlaveSupport/ews-build/master.cfg
>===================================================================
>--- Tools/BuildSlaveSupport/ews-build/master.cfg	(revision 233028)
>+++ Tools/BuildSlaveSupport/ews-build/master.cfg	(working copy)
>@@ -1,6 +1,10 @@
>+import os
>+
> import loadConfig
> 
> 
>+is_test_mode_enabled = os.getenv('BUILDBOT_TESTING') is not None
>+
> c = BuildmasterConfig = {}
> 
> c['www'] = dict(port=8010,
>@@ -20,4 +24,4 @@ c['buildbotURL'] = 'https://ews-build.we
> 
> c['buildbotNetUsageData'] = None
> 
>-loadConfig.loadBuilderConfig(c)
>+loadConfig.loadBuilderConfig(c, use_localhost_worker=is_test_mode_enabled)

Actions: View | Formatted Diff | Diff

Attachments on bug 186871: 343200 | 343211