zuul
/
zuul
Code Issues Proposed changes

Merge "gerrit: use baseurl for change uris lookup"

This commit is contained in:
Zuul 2018-07-14 15:00:12 +00:00 committed by Gerrit Code Review
parent 11709e7044 77bdb08067
commit b354547c52
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zuul/driver/gerrit/gerritconnection.py
View File

@ -18,6 +18,7 @@ import re
import select
import threading
import time
import urllib
import paramiko
import logging
import pprint
@ -478,9 +479,12 @@ class GerritConnection(BaseConnection):
change.project = self.source.getProject(data['project'])
change.branch = data['branch']
change.url = data['url']
urlparse = urllib.parse.urlparse(self.baseurl)
baseurl = "%s%s" % (urlparse.netloc, urlparse.path)
baseurl = baseurl.rstrip('/')
change.uris = [
'%s/%s' % (self.server, change.number),
'%s/#/c/%s' % (self.server, change.number),
'%s/%s' % (baseurl, change.number),
'%s/#/c/%s' % (baseurl, change.number),
]
max_ps = 0