From d435c9fd01128e219b02e56694e00d3377e3ce86 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 2 Sep 2022 09:23:15 -0700 Subject: [PATCH] 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 --- doc/source/third_party.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/source/third_party.rst b/doc/source/third_party.rst index 240ebf45be..e6fd3e4152 100644 --- a/doc/source/third_party.rst +++ b/doc/source/third_party.rst @@ -306,11 +306,11 @@ Here’s 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