zuul/zuul
Code Issues Proposed changes

Add MERGE_FAILURE buildset result

Browse Source 
We now report a distinct buildset result to the database if the upstream code
review system is unable to merge a change.  Previously it was reported as
MERGE_CONFLICT which makes it difficult to distinguish from merge conflicts.

Essentially, the two states we're interested in are when Zuul's merger is
unable to prepare a git checkout of the change (99% of the time, this is
a merge conflict).  This is the MERGE_CONFLICT result.

The second state is when Zuul asks Gerrit/Github/etc to submit/merge a change
and the remote system is unable (or refuses) to do so.  This is MERGE_FAILURE.

Change-Id: I47af242aeb19ae4b4aedde353fcc76ff82d90fbe
This commit is contained in:
James E. Blair
2022-02-24 18:32:20 -08:00
parent e03d8c887c
commit 370d36c025
9 changed files with 64 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
releasenotes/notes/merge-failure-result-28bf93bec49b2b09.yaml Normal file
View File

@@ -0,0 +1,6 @@
---
features:
- |
A new buildset result ``MERGE_FAILURE`` is stored in the build
database in the case where a buildset is unable to be merged by
the upstream code review system.