Merge "Normalize semaphore branch handling"
diff --git a/zuul/lib/connections.py b/zuul/lib/connections.py
index 33c66f9..3b3f1ae 100644
--- a/zuul/lib/connections.py
+++ b/zuul/lib/connections.py
@@ -170,6 +170,16 @@
connection = self.connections[connection_name]
return connection.driver.getTrigger(connection, config)
+ def getSourceByHostname(self, hostname):
+ for connection in self.connections.values():
+ if hasattr(connection, 'canonical_hostname'):
+ if connection.canonical_hostname == hostname:
+ return self.getSource(connection.connection_name)
+ if hasattr(connection, 'server'):
+ if connection.server == hostname:
+ return self.getSource(connection.connection_name)
+ return None
+
def getSourceByCanonicalHostname(self, canonical_hostname):
for connection in self.connections.values():
if hasattr(connection, 'canonical_hostname'):
diff --git a/zuul/manager/__init__.py b/zuul/manager/__init__.py
index b8a280f..3c77990 100644
--- a/zuul/manager/__init__.py
+++ b/zuul/manager/__init__.py
@@ -360,7 +360,7 @@
url = urllib.parse.urlparse(match)
except ValueError:
continue
- source = self.sched.connections.getSourceByCanonicalHostname(
+ source = self.sched.connections.getSourceByHostname(
url.hostname)
if not source:
continue