opendev/project-config-example
Code Issues Proposed changes

Update deprecated zuul syntax

Browse Source 
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
This commit is contained in:
Clark Boylan 2022-09-02 09:19:09 -07:00
parent ecd1be616a
commit 28fff67469
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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. 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`. 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. After testing your CI system update this section to include other projects.

4
zuul/layout.yaml
View File

@ -22,12 +22,12 @@ pipelines:
failure: failure:
gerrit: gerrit:
verified: -1 verified: -1
merge-failure: merge-conflict:
smtp: smtp:
#TODO: Update these to real e-mail addresses #TODO: Update these to real e-mail addresses
to: third_party_ci@example.com to: third_party_ci@example.com
from: zuul@example.com from: zuul@example.com
subject: Upstream change {change} has a merge failure subject: Upstream change {change} has a merge conflict
- name: silent - name: silent