From d82d4f1d365346ee5f9ef92160c5390cd6530d58 Mon Sep 17 00:00:00 2001
From: Matthieu Huin <mhuin@redhat.com>
Date: Dec 22 2020 10:22:34 +0000
Subject: [PATCH 1/4] Add a link to fedora wiki's article on Zuul in failure messages


---

diff --git a/zuul.d/_pipelines.yaml b/zuul.d/_pipelines.yaml
index 7dc3ad4..a7af92c 100644
--- a/zuul.d/_pipelines.yaml
+++ b/zuul.d/_pipelines.yaml
@@ -78,6 +78,8 @@
         status: 'failure'
         status-url: "https://fedora.softwarefactory-project.io/zuul/buildset/{buildset.uuid}"
       sqlreporter:
+    failure-message:
+      Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
 
 - pipeline:
     name: gate
@@ -197,6 +199,8 @@
         status-url: "https://fedora.softwarefactory-project.io/zuul/buildset/{buildset.uuid}"
         comment: true
       sqlreporter:
+    failure-message:
+      Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
     window-floor: 20
     window-increase-factor: 2
 
@@ -224,6 +228,8 @@
         to: "root@localhost"
         subject: '[Zuul] Job failed in post pipeline: {change.project}'
       sqlreporter:
+    failure-message:
+      Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
 
 - pipeline:
     name: tag
@@ -249,6 +255,8 @@
         to: "root@localhost"
         subject: '[Zuul] Job failed in tag pipeline: {change.project}'
       sqlreporter:
+    failure-message:
+      Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
 
 - pipeline:
     name: promote
@@ -296,6 +304,8 @@
       github.com:
         status: failure
       sqlreporter:
+    failure-message:
+      Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
 
 - pipeline:
     name: periodic
@@ -314,6 +324,8 @@
         to: "root@localhost"
         subject: '[Zuul] Job failed in periodic pipeline: {change.project}'
       sqlreporter:
+    failure-message:
+      Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
 
 - pipeline:
     name: experimental
@@ -345,3 +357,5 @@
       pagure.io: {}
       src.fedoraproject.org: {}
       sqlreporter:
+    failure-message:
+      Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

From cd2903651526bd8f0ddbcb7e88262f9ba85f636d Mon Sep 17 00:00:00 2001
From: Matthieu Huin <mhuin@redhat.com>
Date: Dec 22 2020 11:07:26 +0000
Subject: [PATCH 2/4] Fix duplicate failure messages


---

diff --git a/zuul.d/_pipelines.yaml b/zuul.d/_pipelines.yaml
index a7af92c..2e2a6d4 100644
--- a/zuul.d/_pipelines.yaml
+++ b/zuul.d/_pipelines.yaml
@@ -88,8 +88,6 @@
       in order in this pipeline, and if they pass tests, will be
       merged.
     success-message: Build succeeded (gate pipeline).
-    failure-message: |
-      Build failed (gate pipeline).
     manager: dependent
     precedence: high
     post-review: True
@@ -200,7 +198,7 @@
         comment: true
       sqlreporter:
     failure-message:
-      Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
+      Build failed (gate pipeline). More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
     window-floor: 20
     window-increase-factor: 2
 
@@ -265,8 +263,6 @@
       in order to promote artifacts generated in the gate
       pipeline.
     success-message: Build succeeded (promote pipeline).
-    failure-message: |
-      Build failed (promote pipeline).
     manager: supercedent
     precedence: high
     post-review: True
@@ -305,7 +301,7 @@
         status: failure
       sqlreporter:
     failure-message:
-      Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
+      Build failed (promote pipeline). More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
 
 - pipeline:
     name: periodic
@@ -331,7 +327,6 @@
     name: experimental
     description: On-demand pipeline for requesting a run against a set of jobs that are not yet gating. Leave review comment of "check experimental" to run jobs in this pipeline.
     success-message: Build succeeded (experimental pipeline).
-    failure-message: Build failed (experimental pipeline).
     manager: independent
     precedence: normal
     trigger:
@@ -358,4 +353,4 @@
       src.fedoraproject.org: {}
       sqlreporter:
     failure-message:
-      Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
+      Build failed (experimental pipeline). More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

From e9cbc9cdf1310936b78f6cca15dc30fd0df87ad2 Mon Sep 17 00:00:00 2001
From: Matthieu Huin <mhuin@redhat.com>
Date: Dec 22 2020 11:12:01 +0000
Subject: [PATCH 3/4] remove wiki link when unnecessary


---

diff --git a/zuul.d/_pipelines.yaml b/zuul.d/_pipelines.yaml
index 2e2a6d4..be1d718 100644
--- a/zuul.d/_pipelines.yaml
+++ b/zuul.d/_pipelines.yaml
@@ -227,7 +227,7 @@
         subject: '[Zuul] Job failed in post pipeline: {change.project}'
       sqlreporter:
     failure-message:
-      Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
+      Build failed (post pipeline).
 
 - pipeline:
     name: tag
@@ -254,7 +254,7 @@
         subject: '[Zuul] Job failed in tag pipeline: {change.project}'
       sqlreporter:
     failure-message:
-      Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
+      Build failed (tag pipeline).
 
 - pipeline:
     name: promote
@@ -320,8 +320,6 @@
         to: "root@localhost"
         subject: '[Zuul] Job failed in periodic pipeline: {change.project}'
       sqlreporter:
-    failure-message:
-      Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci
 
 - pipeline:
     name: experimental

From c38a8f4d7b42412d759f0035ff89d8f0194f6749 Mon Sep 17 00:00:00 2001
From: Matthieu Huin <mhuin@redhat.com>
Date: Dec 22 2020 13:17:02 +0000
Subject: [PATCH 4/4] Remove useless failure messages


---

diff --git a/zuul.d/_pipelines.yaml b/zuul.d/_pipelines.yaml
index be1d718..87bdd58 100644
--- a/zuul.d/_pipelines.yaml
+++ b/zuul.d/_pipelines.yaml
@@ -226,8 +226,6 @@
         to: "root@localhost"
         subject: '[Zuul] Job failed in post pipeline: {change.project}'
       sqlreporter:
-    failure-message:
-      Build failed (post pipeline).
 
 - pipeline:
     name: tag
@@ -253,8 +251,6 @@
         to: "root@localhost"
         subject: '[Zuul] Job failed in tag pipeline: {change.project}'
       sqlreporter:
-    failure-message:
-      Build failed (tag pipeline).
 
 - pipeline:
     name: promote