Update example zuul config to remove deprecated syntax

The zuul pipeline reporter for merge-failure has been renamed to
merge-conflict. The old name has been depreacted and will be removed in
a future release. Update our examples to match Zuul's current
expectations.

Change-Id: I1f9effa311163d942171e35ba65fafa25245e9d2
This commit is contained in:
Clark Boylan 2022-09-02 09:23:15 -07:00
parent dcabcd45fa
commit d435c9fd01
1 changed files with 2 additions and 2 deletions

View File

@ -306,11 +306,11 @@ Heres a snippet from that file that constructs the ``check`` pipeline taken f
failure:
gerrit:
verified: -1
merge-failure:
merge-conflict:
smtp:
to: third_party_ci@example.com
from: zuul@example.com
subject: Upstream change {change} has a merge failure
subject: Upstream change {change} has a merge conflict
This pipeline is configured to trigger on any Gerrit event that represents a new