openstack/project-config
Code Issues Proposed changes

Update deprecated merge-failure zuul syntax

Browse Source 
The zuul pipeline reporter for merge-failure is now canonically called
merge-conflict. The old name has been deprecated and will be removed in
the near future. Update our config to use the new name.

Change-Id: Iaf49c8231618c7a24a0dca7f23d5b3770818dc80
This commit is contained in:
Clark Boylan 2022-09-02 09:20:34 -07:00
parent ba93b3570a
commit b9828899a7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zuul.d/pipelines.yaml
View File

@ -360,8 +360,8 @@
github: github:
check: 'failure' check: 'failure'
comment: false comment: false
# Don't report merge-failures to github # Don't report merge-conflicts to github
merge-failure: {} merge-conflict: {}
# NOTE(ianw) 2019-12 : since we have very limited ARM64 resources, we # NOTE(ianw) 2019-12 : since we have very limited ARM64 resources, we
# have a separate pipeline so ARM64 jobs can start and queue gerrit # have a separate pipeline so ARM64 jobs can start and queue gerrit