diff options
| author | Zuul <zuul@review.opendev.org> | 2022-09-16 03:27:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-09-16 03:27:51 +0000 |
| commit | cda23ce556bdc9b56bcc662bc2370ded258e9def (patch) | |
| tree | 2900c8b2b90bf3f6f0a4d5c9993336f9d22059f2 /tests/fixtures | |
| parent | 861f9934af8ca8408d265cfeb4f8110e9eb92ceb (diff) | |
| parent | 024246cb72b05caca3a797612490f83c1434d339 (diff) | |
| download | zuul-cda23ce556bdc9b56bcc662bc2370ded258e9def.tar.gz | |
Merge "Remove merge-failure pipeline configuration"
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: |