Fix gerrit port number setting.
To make port setting of gerrit server in zuul.conf really work. Change-Id: I6f44f21256391fd04e56c18c0b293d9767c5a6a9 Reviewed-on: https://review.openstack.org/13574 Reviewed-by: Monty Taylor <mordred@inaugust.com> Approved: James E. Blair <corvus@inaugust.com> Reviewed-by: James E. Blair <corvus@inaugust.com> Tested-by: Jenkins
This commit is contained in:
parent
b8ff8a7fc7
commit
326e355e89
|
@ -99,6 +99,7 @@ class Gerrit(object):
|
||||||
self,
|
self,
|
||||||
self.username,
|
self.username,
|
||||||
self.hostname,
|
self.hostname,
|
||||||
|
self.port,
|
||||||
keyfile=self.keyfile)
|
keyfile=self.keyfile)
|
||||||
self.watcher_thread.start()
|
self.watcher_thread.start()
|
||||||
|
|
||||||
|
|
|
@ -87,7 +87,7 @@ class Gerrit(object):
|
||||||
else:
|
else:
|
||||||
sshkey = None
|
sshkey = None
|
||||||
if config.has_option('gerrit', 'port'):
|
if config.has_option('gerrit', 'port'):
|
||||||
port = config.get('gerrit', 'port')
|
port = int(config.get('gerrit', 'port'))
|
||||||
else:
|
else:
|
||||||
port = 29418
|
port = 29418
|
||||||
self.gerrit = gerrit.Gerrit(self.server, user, port, sshkey)
|
self.gerrit = gerrit.Gerrit(self.server, user, port, sshkey)
|
||||||
|
@ -282,7 +282,7 @@ class Gerrit(object):
|
||||||
server = self.config.get('gerrit', 'server')
|
server = self.config.get('gerrit', 'server')
|
||||||
user = self.config.get('gerrit', 'user')
|
user = self.config.get('gerrit', 'user')
|
||||||
if self.config.has_option('gerrit', 'port'):
|
if self.config.has_option('gerrit', 'port'):
|
||||||
port = self.config.get('gerrit', 'port')
|
port = int(self.config.get('gerrit', 'port'))
|
||||||
else:
|
else:
|
||||||
port = 29418
|
port = 29418
|
||||||
url = 'ssh://%s@%s:%s/%s' % (user, server, port, project.name)
|
url = 'ssh://%s@%s:%s/%s' % (user, server, port, project.name)
|
||||||
|
|
Loading…
Reference in New Issue