commit 326e355e898b5395b692cc599af8c057bd8570cc
author unicell <unicell@gmail.com> Mon Sep 24 20:58:22 2012 +0800
committer Jenkins <jenkins@review.openstack.org> Thu Sep 27 16:59:44 2012 +0000
tree 910d2b6d96ff4b17103ea4e82d66ddb24ac69124
parent b8ff8a7fc7e7cda468735c50652a4beba5331616

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

zuul/lib/gerrit.py

diff --git a/zuul/lib/gerrit.py b/zuul/lib/gerrit.py
index ca626f0..d493a4d 100644
--- a/zuul/lib/gerrit.py
+++ b/zuul/lib/gerrit.py
@@ -99,6 +99,7 @@
             self,
             self.username,
             self.hostname,
+            self.port,
             keyfile=self.keyfile)
         self.watcher_thread.start()
 

zuul/trigger/gerrit.py

diff --git a/zuul/trigger/gerrit.py b/zuul/trigger/gerrit.py
index 1c4b74c..8e9186e 100644
--- a/zuul/trigger/gerrit.py
+++ b/zuul/trigger/gerrit.py
@@ -87,7 +87,7 @@
         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 @@
         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)