Changeset 233047 in webkit

Timestamp:

Jun 21, 2018, 11:42:28 AM (7 years ago)

Author:

aakash_jain@apple.com

Message:

Add support for using localhost worker in OpenSource EWS Buildbot
​https://bugs.webkit.org/show_bug.cgi?id=186871

Reviewed by Lucas Forschler.

• BuildSlaveSupport/ews-build/loadConfig.py:

(loadBuilderConfig): Added 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.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/ews-build/loadConfig.py (modified) (3 diffs)
• BuildSlaveSupport/ews-build/master.cfg (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/ews-build/loadConfig.py

@@ -36 +36 @@
 
 
-def loadBuilderConfig(c):
+def loadBuilderConfig(c, use_localhost_worker=False):
     config = json.load(open('config.json'))
     passwords = json.load(open('passwords.json'))
@@ -42 +42 @@
 
     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']:
@@ -50 +53 @@
         if 'configuration' in builder:
             del builder['configuration']
+
+        if use_localhost_worker:
+            builder['workernames'].append("local-worker")
+
         c['builders'].append(builder)
 

trunk/Tools/BuildSlaveSupport/ews-build/master.cfg

@@ +1 @@
+import os
+
 import loadConfig
 
+
+is_test_mode_enabled = os.getenv('BUILDBOT_TESTING') is not None
 
 c = BuildmasterConfig = {}
@@ -21 +25 @@
 c['buildbotNetUsageData'] = None
 
-loadConfig.loadBuilderConfig(c)
+loadConfig.loadBuilderConfig(c, use_localhost_worker=is_test_mode_enabled)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-06-21  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 Lucas Forschler.
+
+        * BuildSlaveSupport/ews-build/loadConfig.py:
+        (loadBuilderConfig): Added 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-21  Aakash Jain  <aakash_jain@apple.com>