diff options
| author | Felix Edel <felix.edel@bmw.de> | 2021-07-21 14:23:43 +0200 |
|---|---|---|
| committer | James E. Blair <jim@acmegating.com> | 2021-08-06 15:40:41 -0700 |
| commit | 8038f9f75cafe2a1bf5e4c9faf7544427deb7084 (patch) | |
| tree | 91ed6c7255b16de6fde96f044b5f37c58608cce9 /zuul/driver/git | |
| parent | 97152216b2830e8e80fad6aa3f84e97ad365c688 (diff) | |
| download | zuul-8038f9f75cafe2a1bf5e4c9faf7544427deb7084.tar.gz | |
Execute merge jobs via ZooKeeper
This is the second part of I767c0b4c5473b2948487c3ae5bbc612c25a2a24a.
It uses the MergerAPI.
Note: since we no longer have a central gearman server where we can
record all of the merge jobs, some tests now consult the merger api
to get the list of merge jobs which were submitted by that scheduler.
This should generally be equivalent, but something to keep in mind
as we add multiple schedulers.
Change-Id: I1c694bcdc967283f1b1a4821df7700d93240690a
Diffstat (limited to 'zuul/driver/git')
| -rw-r--r-- | zuul/driver/git/gitconnection.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/zuul/driver/git/gitconnection.py b/zuul/driver/git/gitconnection.py index fe6e52388..cb5fe84c4 100644 --- a/zuul/driver/git/gitconnection.py +++ b/zuul/driver/git/gitconnection.py @@ -66,7 +66,8 @@ class GitConnection(BaseConnection): def getChangeFilesUpdated(self, project_name, branch, tosha): job = self.sched.merger.getFilesChanges( - self.connection_name, project_name, branch, tosha) + self.connection_name, project_name, branch, tosha, + needs_result=True) self.log.debug("Waiting for fileschanges job %s" % job) job.wait() if not job.updated: |