diff --git a/zuul/executor/server.py b/zuul/executor/server.py index bf0faa1169..5731ef1ec1 100644 --- a/zuul/executor/server.py +++ b/zuul/executor/server.py @@ -3938,8 +3938,7 @@ class ExecutorServer(BaseMergeServer): self.merger.updateRepo( task.connection_name, task.project_name, repo_state=task.repo_state, - zuul_event_id=task.zuul_event_id, build=task.build, - process_worker=self.process_worker) + zuul_event_id=task.zuul_event_id, build=task.build) source = self.connections.getSource(task.connection_name) project = source.getProject(task.project_name) task.canonical_name = project.canonical_name diff --git a/zuul/merger/merger.py b/zuul/merger/merger.py index a704dc76a1..4d9d012717 100644 --- a/zuul/merger/merger.py +++ b/zuul/merger/merger.py @@ -616,7 +616,7 @@ class Repo(object): branch) Repo._setRef(f"refs/remotes/origin/{branch}", hexsha, repo) - def deleteRef(self, path, repo=None, zuul_event_id=None): + def deleteRef(self, path, zuul_event_id=None): # This is only used in tests ref_log = get_annotated_logger( logging.getLogger("zuul.Repo.Ref"), zuul_event_id) @@ -1139,7 +1139,7 @@ class Merger(object): retry_timeout=retry_timeout) def updateRepo(self, connection_name, project_name, repo_state=None, - zuul_event_id=None, build=None, process_worker=None): + zuul_event_id=None, build=None): """Fetch from origin if needed If repo_state is None, then this will always git fetch.