Changeset 268596 in webkit

Timestamp:

Oct 16, 2020 10:45:39 AM (4 years ago)

Author:

aakash_jain@apple.com

Message:

[build.webkit.org] buildbot checkconfig fails when passwords.json is missing
​https://bugs.webkit.org/show_bug.cgi?id=217831

Reviewed by Darin Adler.

• BuildSlaveSupport/build.webkit.org-config/master.cfg: Set is_test_mode_enabled based on BUILDBOT_TESTING env variable.
• BuildSlaveSupport/build.webkit.org-config/loadConfig.py: Renamed test_mode_is_enabled to is_test_mode_enabled to

be consistent with EWS code.

• BuildSlaveSupport/build.webkit.org-config/steps_unittest.py: Ditto.

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/loadConfig.py (modified) (2 diffs)
• BuildSlaveSupport/build.webkit.org-config/master.cfg (modified) (2 diffs)
• BuildSlaveSupport/build.webkit.org-config/steps_unittest.py (modified) (1 diff)
• ChangeLog (modified) (1 diff)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py

@@ -48 +48 @@
 
 
-def loadBuilderConfig(c, test_mode_is_enabled=False):
+def loadBuilderConfig(c, is_test_mode_enabled=False):
     # FIXME: These file handles are leaked.
-    if test_mode_is_enabled:
-        passwords = make_passwords_json.create_mock_worker_passwords_dict()
+    if is_test_mode_enabled:
+        passwords = {}
     else:
         passwords = json.load(open('passwords.json'))
@@ -59 +59 @@
 
     config = json.load(open('config.json'))
-    c['slaves'] = [BuildSlave(worker['name'], passwords[worker['name']], max_builds=1) for worker in config['workers']]
+    c['slaves'] = [BuildSlave(worker['name'], passwords.get(worker['name'], 'password'), max_builds=1) for worker in config['workers']]
 
     c['schedulers'] = []

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg

@@ -9 +9 @@
 from loadConfig import *
 
+
+is_test_mode_enabled = os.getenv('BUILDBOT_TESTING') is not None
 
 c = BuildmasterConfig = {}
@@ -44 +46 @@
 
 
-loadBuilderConfig(c)
+loadBuilderConfig(c, is_test_mode_enabled=is_test_mode_enabled)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py

@@ -689 +689 @@
     from loadConfig import *
     c = {}
-    loadBuilderConfig(c, test_mode_is_enabled=True)
+    loadBuilderConfig(c, is_test_mode_enabled=True)
     BuildStepsConstructorTest.generateTests()
     BuildStepsTest.generateTests()

trunk/Tools/ChangeLog

@@ +1 @@
+2020-10-16  Aakash Jain  <aakash_jain@apple.com>
+
+        [build.webkit.org] buildbot checkconfig fails when passwords.json is missing
+        https://bugs.webkit.org/show_bug.cgi?id=217831
+
+        Reviewed by Darin Adler.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg: Set is_test_mode_enabled based on BUILDBOT_TESTING env variable.
+        * BuildSlaveSupport/build.webkit.org-config/loadConfig.py: Renamed test_mode_is_enabled to is_test_mode_enabled to
+        be consistent with EWS code.
+        * BuildSlaveSupport/build.webkit.org-config/steps_unittest.py: Ditto.
+
 2020-10-16  Aakash Jain  <aakash_jain@apple.com>