Remove merge-failure pipeline configuration

This was previously deprecated and should be removed shortly before
we release Zuul v7.

Change-Id: Idbdfca227d2f7ede5583f031492868f634e1a990

3 files changed, 12 insertions, 12 deletions

diff --git a/releasenotes/notes/merge-conflict-rename-2-1e60065f196e48af.yaml b/releasenotes/notes/merge-conflict-rename-2-1e60065f196e48af.yaml
new file mode 100644
index 000000000..962c1702e
--- /dev/null
+++ b/releasenotes/notes/merge-conflict-rename-2-1e60065f196e48af.yaml
@@ -0,0 +1,6 @@
+upgrade:
+  - |
+    The previously deprecated ``merge-failure`` and
+    ``merge-failure-message`` pipeline configuration options have been
+    removed.  Use ``merge-conflict`` and ``merge-conflict-message``
+    respectively instead.
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:
diff --git a/zuul/configloader.py b/zuul/configloader.py
index 365967d56..85a28c828 100644
--- a/zuul/configloader.py
+++ b/zuul/configloader.py
@@ -1227,7 +1227,6 @@ class PipelineParser(object):
                     'failure-message': str,
                     'start-message': str,
                     'merge-conflict-message': str,
-                    'merge-failure-message': str,
                     'enqueue-message': str,
                     'no-jobs-message': str,
                     'footer-message': str,
@@ -1250,8 +1249,8 @@ class PipelineParser(object):
         pipeline['reject'] = self.getDriverSchema('reject')
         pipeline['trigger'] = vs.Required(self.getDriverSchema('trigger'))
         for action in ['enqueue', 'start', 'success', 'failure',
-                       'merge-conflict', 'merge-failure', 'no-jobs',
-                       'disabled', 'dequeue', 'config-error']:
+                       'merge-conflict', 'no-jobs', 'disabled',
+                       'dequeue', 'config-error']:
             pipeline[action] = self.getDriverSchema('reporter')
         return vs.Schema(pipeline)
 
@@ -1267,15 +1266,12 @@ class PipelineParser(object):
         pipeline.precedence = precedence
         pipeline.failure_message = conf.get('failure-message',
                                             "Build failed.")
-        # TODO: Remove in Zuul v6.0
-        backwards_compat_merge_message = conf.get(
-            'merge-failure-message', "Merge Failed.\n\nThis change or one "
+        pipeline.merge_conflict_message = conf.get(
+            'merge-conflict-message', "Merge Failed.\n\nThis change or one "
             "of its cross-repo dependencies was unable to be "
             "automatically merged with the current state of its "
             "repository. Please rebase the change and upload a new "
             "patchset.")
-        pipeline.merge_conflict_message = conf.get(
-            'merge-conflict-message', backwards_compat_merge_message)
 
         pipeline.success_message = conf.get('success-message',
                                             "Build succeeded.")
@@ -1297,8 +1293,6 @@ class PipelineParser(object):
         # TODO: Remove in Zuul v6.0
         # Make a copy to manipulate for backwards compat.
         conf_copy = conf.copy()
-        if 'merge-failure' in conf_copy and 'merge-conflict' not in conf_copy:
-            conf_copy['merge-conflict'] = conf_copy['merge-failure']
 
         for conf_key, action in self.reporter_actions.items():
             reporter_set = []