Merge "Support IPv6 in the finger log streamer" into feature/zuulv3
diff --git a/zuul/executor/server.py b/zuul/executor/server.py
index daa029f..03fcb4a 100644
--- a/zuul/executor/server.py
+++ b/zuul/executor/server.py
@@ -1162,6 +1162,7 @@
ansible_user=self.executor_server.default_username,
ansible_port=port,
nodepool=dict(
+ label=node.get('label'),
az=node.get('az'),
cloud=node.get('cloud'),
provider=node.get('provider'),
diff --git a/zuul/merger/merger.py b/zuul/merger/merger.py
index ed98696..8b98bfb 100644
--- a/zuul/merger/merger.py
+++ b/zuul/merger/merger.py
@@ -191,11 +191,14 @@
def checkout(self, ref):
repo = self.createRepoObject()
self.log.debug("Checking out %s" % ref)
- repo.head.reference = ref
+ # Perform a hard reset before checking out so that we clean up
+ # anything that might be left over from a merge.
reset_repo_to_head(repo)
+ repo.git.checkout(ref)
return repo.head.commit
def checkoutLocalBranch(self, branch):
+ # TODO(jeblair): retire in favor of checkout
repo = self.createRepoObject()
# Perform a hard reset before checking out so that we clean up
# anything that might be left over from a merge.
@@ -341,10 +344,6 @@
return self._addProject(hostname, project_name, url, sshkey)
def updateRepo(self, connection_name, project_name):
- # TODOv3(jhesketh): Reimplement
- # da90a50b794f18f74de0e2c7ec3210abf79dda24 after merge..
- # Likely we'll handle connection context per projects differently.
- # self._setGitSsh()
repo = self.getRepo(connection_name, project_name)
try:
self.log.info("Updating local repository %s/%s",