Title: [294751] trunk/Tools/CISupport/build-webkit-org/master.cfg
- Revision
- 294751
- Author
- [email protected]
- Date
- 2022-05-24 09:39:51 -0700 (Tue, 24 May 2022)
Log Message
[build.webkit.org] Allow configuring multiple user credentials
https://bugs.webkit.org/show_bug.cgi?id=240826
Reviewed by Aakash Jain.
Allow configuring multiple user credentials for build.webkit.org as we
did for ews-build.webkit.org in 246332@main. This also loads credentials
from passwords.json instead of environment variables.
* Tools/CISupport/build-webkit-org/master.cfg:
Canonical link: https://commits.webkit.org/250919@main
Modified Paths
Diff
Modified: trunk/Tools/CISupport/build-webkit-org/master.cfg (294750 => 294751)
--- trunk/Tools/CISupport/build-webkit-org/master.cfg 2022-05-24 16:15:40 UTC (rev 294750)
+++ trunk/Tools/CISupport/build-webkit-org/master.cfg 2022-05-24 16:39:51 UTC (rev 294751)
@@ -42,17 +42,16 @@
}
if not is_test_mode_enabled:
- admin_username = load_password('ADMIN_USERNAME')
- admin_password = load_password('ADMIN_PASSWORD')
- if not admin_username or not admin_password:
- print('\n\nERROR: Admin username/password missing from passwords.json.\n')
+ credentials = load_password('BUILD_WEBKIT_CREDENTIALS')
+ if not credentials:
+ print('BUILD_WEBKIT credentials not found. Please ensure BUILD_WEBKIT_CREDENTIALS is configured either in env variables or in passwords.json')
sys.exit(1)
# See https://docs.buildbot.net/2.10.0/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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
