From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Tue, 9 Feb 2016 01:23:01 +0000 (-0500)
Subject: Fix Zuul failing --force-message against Gerrit 2.12
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=cd6326d7ba944c0365fd29bc1a18b2ef5cafb9f7;p=ci-management.git

Fix Zuul failing --force-message against Gerrit 2.12

We probably don't need the "success-message" and "failure-message" but I
think adding it for clarity of which type of job is leaving a comment is
nice.

Change-Id: I7210c0281e3954f714ad5aa308ad8206f25878be
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 23e06b61e..b312e3dde 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -49,17 +49,17 @@ pipelines:
   - name: post-merge
     source: gerrit
     manager: IndependentPipelineManager
+    success-message: Build succeeded (check merge)
+    failure-message: Build failed (check merge)
     trigger:
       gerrit:
         - event: change-merged
         - event: comment-added
           comment: (?i)^(Patch Set [0-9]+:)?( [\w\\+-]*)*(\n\n)?\s*(remerge)
     success:
-      gerrit:
-        force-message: True
+      gerrit: {}
     failure:
-      gerrit:
-        force-message: True
+      gerrit: {}
 
 ##############################################################################
 ### Project Templates