Title: [267277] trunk/Tools
- Revision
- 267277
- Author
- aakash_j...@apple.com
- Date
- 2020-09-18 12:46:33 -0700 (Fri, 18 Sep 2020)
Log Message
Make ews-app robust against config.json issues
https://bugs.webkit.org/show_bug.cgi?id=216705
Reviewed by Jonathan Bedard.
* BuildSlaveSupport/ews-app/ews/common/buildbot.py:
(Buildbot.fetch_config):
(Buildbot.update_icons_for_queues_mapping):
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/ews-app/ews/common/buildbot.py (267276 => 267277)
--- trunk/Tools/BuildSlaveSupport/ews-app/ews/common/buildbot.py 2020-09-18 19:36:39 UTC (rev 267276)
+++ trunk/Tools/BuildSlaveSupport/ews-app/ews/common/buildbot.py 2020-09-18 19:46:33 UTC (rev 267277)
@@ -92,7 +92,11 @@
config_data = util.fetch_data_from_url(config_url)
if not config_data:
return {}
- return config_data.json()
+ try:
+ return config_data.json()
+ except Exception as e:
+ _log.error('Error in fetching {}. Error: {}'.format(config_url, e))
+ return {}
@classmethod
def update_icons_for_queues_mapping(cls):
@@ -99,6 +103,7 @@
config = cls.fetch_config()
if not config:
_log.warn('Unable to fetch buildbot config.json')
+ return
for builder in config.get('builders', []):
shortname = builder.get('shortname')
Buildbot.icons_for_queues_mapping[shortname] = builder.get('icon')
Modified: trunk/Tools/ChangeLog (267276 => 267277)
--- trunk/Tools/ChangeLog 2020-09-18 19:36:39 UTC (rev 267276)
+++ trunk/Tools/ChangeLog 2020-09-18 19:46:33 UTC (rev 267277)
@@ -1,3 +1,14 @@
+2020-09-18 Aakash Jain <aakash_j...@apple.com>
+
+ Make ews-app robust against config.json issues
+ https://bugs.webkit.org/show_bug.cgi?id=216705
+
+ Reviewed by Jonathan Bedard.
+
+ * BuildSlaveSupport/ews-app/ews/common/buildbot.py:
+ (Buildbot.fetch_config):
+ (Buildbot.update_icons_for_queues_mapping):
+
2020-09-18 Diego Pino Garcia <dp...@igalia.com>
[ews] Set only one worker for JSC ARMv7 builder and tester queues
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
