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

@@ -99,6 +99,7 @@ class Gerrit(object):
             self,
             self.username,
             self.hostname,
+            self.port,
             keyfile=self.keyfile)
         self.watcher_thread.start()
 

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)