From 77bdb080678e203668d6298b2e44322899a784a4 Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Fri, 29 Jun 2018 07:57:44 +0000
Subject: [PATCH] gerrit: use baseurl for change uris lookup

This is a follow-up to https://review.openstack.org/570006 to support gerrit
hosted on prefixed url. In that cases, the getChangesDependingOn method needs
to also use the url preffix in the lookup query.

This change uses the connection base_url instead of the server name to create
the uris.

Change-Id: I2c9ebe7ff98f78fa6e83e009398f2cea13d17e89
---
 zuul/driver/gerrit/gerritconnection.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/zuul/driver/gerrit/gerritconnection.py b/zuul/driver/gerrit/gerritconnection.py
index c814fd7aa1..0231491d9d 100644
--- a/zuul/driver/gerrit/gerritconnection.py
+++ b/zuul/driver/gerrit/gerritconnection.py
@@ -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