diff options
author | Zuul <zuul@review.opendev.org> | 2019-05-20 21:45:53 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2019-05-20 21:45:53 +0000 |
commit | b45b375554cf3583a93fdc723f1b67a1b473a767 (patch) | |
tree | 48fa162c7689f2fa8b88a9a77860971da7326e24 /zuul/manager/__init__.py | |
parent | 049a864a2f70356b60b4645fb5d5b1a06456735a (diff) | |
parent | 7639053905f6c94f57b15793cbe2493229828cd6 (diff) | |
download | zuul-b45b375554cf3583a93fdc723f1b67a1b473a767.tar.gz |
Merge "Annotate merger logs with event id"
Diffstat (limited to 'zuul/manager/__init__.py')
-rw-r--r-- | zuul/manager/__init__.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/zuul/manager/__init__.py b/zuul/manager/__init__.py index 08761da59..e2f2b9bfd 100644 --- a/zuul/manager/__init__.py +++ b/zuul/manager/__init__.py @@ -623,11 +623,13 @@ class PipelineManager(object): if isinstance(item.change, model.Change): self.sched.merger.mergeChanges(build_set.merger_items, item.current_build_set, files, dirs, - precedence=self.pipeline.precedence) + precedence=self.pipeline.precedence, + event=item.event) else: self.sched.merger.getRepoState(build_set.merger_items, item.current_build_set, - precedence=self.pipeline.precedence) + precedence=self.pipeline.precedence, + event=item.event) return False def scheduleFilesChanges(self, item): @@ -638,7 +640,8 @@ class PipelineManager(object): self.sched.merger.getFilesChanges( item.change.project.connection_name, item.change.project.name, - item.change.ref, item.change.branch, build_set=build_set) + item.change.ref, item.change.branch, build_set=build_set, + event=item.event) return False def prepareItem(self, item): |