summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-10-10 05:28:32 +0000
committerGerrit Code Review <review@openstack.org>2019-10-10 05:28:32 +0000
commit63805571119084877d7510885de5fb270c0d13da (patch)
tree9141a7b669787df1a9bd5027fc0f0852257e030f
parentdb2e6df49f7dba74d294a54daaf0231892f815d7 (diff)
parent763234976d6f81b5fcb1c3eda7586aec15c95d0a (diff)
downloadzuul-63805571119084877d7510885de5fb270c0d13da.tar.gz
Merge "Ensure tenant web_root url has a trailing slash"
-rw-r--r--zuul/configloader.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/zuul/configloader.py b/zuul/configloader.py
index 43e1f3db9..3b7c53f08 100644
--- a/zuul/configloader.py
+++ b/zuul/configloader.py
@@ -1479,6 +1479,8 @@ class TenantParser(object):
if conf.get('report-build-page') is not None:
tenant.report_build_page = conf['report-build-page']
tenant.web_root = conf.get('web-root', self.scheduler.web_root)
+ if tenant.web_root and not tenant.web_root.endswith('/'):
+ tenant.web_root += '/'
tenant.allowed_triggers = conf.get('allowed-triggers')
tenant.allowed_reporters = conf.get('allowed-reporters')
tenant.allowed_labels = conf.get('allowed-labels')