Update deprecated merge-failure zuul syntax
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:
parent
ba93b3570a
commit
b9828899a7
@ -360,8 +360,8 @@
|
||||
github:
|
||||
check: 'failure'
|
||||
comment: false
|
||||
# Don't report merge-failures to github
|
||||
merge-failure: {}
|
||||
# Don't report merge-conflicts to github
|
||||
merge-conflict: {}
|
||||
|
||||
# NOTE(ianw) 2019-12 : since we have very limited ARM64 resources, we
|
||||
# have a separate pipeline so ARM64 jobs can start and queue gerrit
|
||||
|
Loading…
Reference in New Issue
Block a user