diff options
| author | James E. Blair <jim@acmegating.com> | 2022-08-22 16:17:32 -0700 |
|---|---|---|
| committer | James E. Blair <jim@acmegating.com> | 2022-09-02 10:13:41 -0700 |
| commit | 024246cb72b05caca3a797612490f83c1434d339 (patch) | |
| tree | c0fe8e0a341b774011004289957e4601f8d46eb2 /tests/fixtures | |
| parent | 7949efd255e76dd63412a13edac3927bf2939b84 (diff) | |
| download | zuul-024246cb72b05caca3a797612490f83c1434d339.tar.gz | |
Remove merge-failure pipeline configuration
This was previously deprecated and should be removed shortly before
we release Zuul v7.
Change-Id: Idbdfca227d2f7ede5583f031492868f634e1a990
Diffstat (limited to 'tests/fixtures')
| -rw-r--r-- | tests/fixtures/layouts/merge-failure.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/fixtures/layouts/merge-failure.yaml b/tests/fixtures/layouts/merge-failure.yaml index 3828a06eb..2efcdced3 100644 --- a/tests/fixtures/layouts/merge-failure.yaml +++ b/tests/fixtures/layouts/merge-failure.yaml @@ -23,7 +23,7 @@ name: gate manager: dependent failure-message: Build failed. For information on how to proceed, see http://wiki.example.org/Test_Failures - merge-failure-message: The merge failed! For more information... + merge-conflict-message: The merge failed! For more information... trigger: gerrit: - event: comment-added @@ -36,7 +36,7 @@ failure: gerrit: Verified: -2 - merge-failure: + merge-conflict: gerrit: Verified: -1 smtp: |