From 28fff6746933ee00bc67fb26a40782c5644fc3d0 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 2 Sep 2022 09:19:09 -0700 Subject: [PATCH] Update deprecated zuul syntax merge-failure has become merge-conflict in pipeline reporting configurations. The old syntax has been deprecated and will be removed soon. Update our examples to match current expectations. Change-Id: I7b3f07d071d52e4e6fe906e9037b489ae2455b43 --- README.md | 2 +- zuul/layout.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 3b0b9d1..0ebfbb3 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ the full configuration details in the [Zuul manual](http://docs.openstack.org/in 1. Change 'myvendor' in the 'recheck' command to your CI's name. -2. Configure the e-mail addresses for merge-failures and job notification. +2. Configure the e-mail addresses for merge-conflicts and job notification. 3. By default, the project zuul triggers on is `openstack-dev/ci-sandbox`. After testing your CI system update this section to include other projects. diff --git a/zuul/layout.yaml b/zuul/layout.yaml index e166fa7..039869f 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -22,12 +22,12 @@ pipelines: failure: gerrit: verified: -1 - merge-failure: + merge-conflict: smtp: #TODO: Update these to real e-mail addresses 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 - name: silent