2747501dee
Our code was expecting the Gerrit web interface to be available at the root of the Gerrit server which is not always the case since people could publish the Gerrit web interface under a subdirectory. In such configuration, the existing assumption prevents Zuul from getting references information. This patch adds a new optional configuration variable 'baseurl' to the 'gerrit' section. It lets one override the default: [gerrit] server=gerrit.wikimedia.org baseurl=https://gerrit.wikimedia.org/r Updated Gerrit._getInfoRefs() to use 'baseurl' instead of 'server' when creating the url to fetch references from. This is still falling back to the old default whenever gerrit.baseurl is not set. Change-Id: Ia9910acf46fe82c425911784412356598b3c7eac Reviewed-on: https://review.openstack.org/16884 Reviewed-by: Jeremy Stanley <fungi@yuggoth.org> Reviewed-by: James E. Blair <corvus@inaugust.com> Approved: Clark Boylan <clark.boylan@gmail.com> Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Tested-by: Jenkins
19 lines
428 B
Plaintext
19 lines
428 B
Plaintext
[jenkins]
|
|
server=https://jenkins.example.com
|
|
user=jenkins
|
|
apikey=1234567890abcdef1234567890abcdef
|
|
|
|
[gerrit]
|
|
server=review.example.com
|
|
;baseurl=https://review.example.com/r
|
|
user=jenkins
|
|
sshkey=/home/jenkins/.ssh/id_rsa
|
|
|
|
[zuul]
|
|
layout_config=/etc/zuul/layout.yaml
|
|
log_config=/etc/zuul/logging.conf
|
|
pidfile=/var/run/zuul/zuul.pid
|
|
state_dir=/var/lib/zuul
|
|
git_dir=/var/lib/zuul/git
|
|
status_url=https://jenkins.example.com/zuul/status
|