Title: [288443] trunk/Tools
- Revision
- 288443
- Author
- aakash_j...@apple.com
- Date
- 2022-01-24 08:13:21 -0800 (Mon, 24 Jan 2022)
Log Message
Allow configuring multiple user credentials on ews
https://bugs.webkit.org/show_bug.cgi?id=235301
Reviewed by Jonathan Bedard.
* Tools/CISupport/ews-build/master.cfg:
Canonical link: https://commits.webkit.org/246332@main
Modified Paths
Diff
Modified: trunk/Tools/CISupport/ews-build/master.cfg (288442 => 288443)
--- trunk/Tools/CISupport/ews-build/master.cfg 2022-01-24 16:05:24 UTC (rev 288442)
+++ trunk/Tools/CISupport/ews-build/master.cfg 2022-01-24 16:13:21 UTC (rev 288443)
@@ -57,17 +57,16 @@
)
if not is_test_mode_enabled:
- admin_username = os.getenv('EWS_ADMIN_USERNAME')
- admin_password = os.getenv('EWS_ADMIN_PASSWORD')
- if not admin_username or not admin_password:
- print('Environment variables for admin username/password not found. Please ensure these variables are set.')
+ credentials = load_password('EWS_CREDENTIALS')
+ if not credentials:
+ print('EWS credentials not found. Please ensure EWS_CREDENTIALS is configured either in env variables or in passwords.json')
sys.exit(1)
# See https://docs.buildbot.net/current/manual/configuration/www.html#example-configs
authz = util.Authz(
allowRules=[util.AnyControlEndpointMatcher(role="admin")],
- roleMatchers=[util.RolesFromEmails(admin=[admin_username])]
+ roleMatchers=[util.RolesFromEmails(admin=list(credentials.keys()))]
)
- auth = util.UserPasswordAuth({admin_username: admin_password})
+ auth = util.UserPasswordAuth(credentials)
c['www']['auth'] = auth
c['www']['authz'] = authz
Modified: trunk/Tools/ChangeLog (288442 => 288443)
--- trunk/Tools/ChangeLog 2022-01-24 16:05:24 UTC (rev 288442)
+++ trunk/Tools/ChangeLog 2022-01-24 16:13:21 UTC (rev 288443)
@@ -1,3 +1,12 @@
+2022-01-24 Aakash Jain <aakash_j...@apple.com>
+
+ Allow configuring multiple user credentials on ews
+ https://bugs.webkit.org/show_bug.cgi?id=235301
+
+ Reviewed by Jonathan Bedard.
+
+ * CISupport/ews-build/master.cfg:
+
2022-01-24 Joseph Griego <jgri...@igalia.com>
[Shadow Realms] Use WebCore module loaders for shadow realm importValue
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
