From 326e355e898b5395b692cc599af8c057bd8570cc Mon Sep 17 00:00:00 2001 From: unicell Date: Mon, 24 Sep 2012 20:58:22 +0800 Subject: [PATCH] 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 Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- zuul/lib/gerrit.py | 1 + zuul/trigger/gerrit.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/zuul/lib/gerrit.py b/zuul/lib/gerrit.py index ca626f0f8a..d493a4d908 100644 --- a/zuul/lib/gerrit.py +++ b/zuul/lib/gerrit.py @@ -99,6 +99,7 @@ class Gerrit(object): self, self.username, self.hostname, + self.port, keyfile=self.keyfile) self.watcher_thread.start() diff --git a/zuul/trigger/gerrit.py b/zuul/trigger/gerrit.py index 1c4b74c774..8e9186e993 100644 --- a/zuul/trigger/gerrit.py +++ b/zuul/trigger/gerrit.py @@ -87,7 +87,7 @@ class Gerrit(object): else: sshkey = None if config.has_option('gerrit', 'port'): - port = config.get('gerrit', 'port') + port = int(config.get('gerrit', 'port')) else: port = 29418 self.gerrit = gerrit.Gerrit(self.server, user, port, sshkey) @@ -282,7 +282,7 @@ class Gerrit(object): server = self.config.get('gerrit', 'server') user = self.config.get('gerrit', 'user') if self.config.has_option('gerrit', 'port'): - port = self.config.get('gerrit', 'port') + port = int(self.config.get('gerrit', 'port')) else: port = 29418 url = 'ssh://%s@%s:%s/%s' % (user, server, port, project.name)