Title: [268596] trunk/Tools
- Revision
- 268596
- Author
- [email protected]
- Date
- 2020-10-16 10:45:39 -0700 (Fri, 16 Oct 2020)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py (268595 => 268596)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py 2020-10-16 16:33:20 UTC (rev 268595)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/loadConfig.py 2020-10-16 17:45:39 UTC (rev 268596)
@@ -47,10 +47,10 @@
return max(requests, key=operator.attrgetter("submittedAt"))
-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'))
results_server_api_key = passwords.get('results-server-api-key')
@@ -58,7 +58,7 @@
os.environ['RESULTS_SERVER_API_KEY'] = results_server_api_key
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'] = []
for scheduler in config['schedulers']:
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (268595 => 268596)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2020-10-16 16:33:20 UTC (rev 268595)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2020-10-16 17:45:39 UTC (rev 268596)
@@ -9,6 +9,8 @@
from loadConfig import *
+is_test_mode_enabled = os.getenv('BUILDBOT_TESTING') is not None
+
c = BuildmasterConfig = {}
c['change_source'] = PBChangeSource(port=16000)
@@ -43,4 +45,4 @@
c['buildCacheSize'] = 60
-loadBuilderConfig(c)
+loadBuilderConfig(c, is_test_mode_enabled=is_test_mode_enabled)
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py (268595 => 268596)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py 2020-10-16 16:33:20 UTC (rev 268595)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps_unittest.py 2020-10-16 17:45:39 UTC (rev 268596)
@@ -688,7 +688,7 @@
BuildBotConfigLoader()._add_dependent_modules_to_sys_modules()
from loadConfig import *
c = {}
- loadBuilderConfig(c, test_mode_is_enabled=True)
+ loadBuilderConfig(c, is_test_mode_enabled=True)
BuildStepsConstructorTest.generateTests()
BuildStepsTest.generateTests()
unittest.main()
Modified: trunk/Tools/ChangeLog (268595 => 268596)
--- trunk/Tools/ChangeLog 2020-10-16 16:33:20 UTC (rev 268595)
+++ trunk/Tools/ChangeLog 2020-10-16 17:45:39 UTC (rev 268596)
@@ -1,5 +1,17 @@
2020-10-16 Aakash Jain <[email protected]>
+ [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 <[email protected]>
+
[build.webkit.org] Add copyright message to steps_unittest.py
https://bugs.webkit.org/show_bug.cgi?id=217830
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
