Send only one message with commit list.

jenkinsci · Dec 17, 2018 · f56cef4 · f56cef4
1 parent 72d41da
commit f56cef4
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/main/java/jenkins/plugins/slack/ActiveNotifier.java b/src/main/java/jenkins/plugins/slack/ActiveNotifier.java
@@ -110,11 +110,12 @@ public void finalized(AbstractBuild r) {
             } while (previousBuild != null && previousBuild.getResult() == Result.ABORTED);
             Result previousResult = (previousBuild != null) ? previousBuild.getResult() : Result.SUCCESS;
             if(null != previousResult && (result.isWorseThan(previousResult) || moreTestFailuresThanPreviousBuild(r, previousBuild)) && notifier.getNotifyRegression()) {
-                getSlack(r).publish(getBuildStatusMessage(r, notifier.getIncludeTestSummary(),
-                        notifier.getIncludeFailedTests(), notifier.getIncludeCustomMessage()), getBuildColor(r));
+                String message = getBuildStatusMessage(r, notifier.getIncludeTestSummary(),
+                        notifier.getIncludeFailedTests(), notifier.getIncludeCustomMessage());
                 if (notifier.getCommitInfoChoice().showAnything()) {
-                    getSlack(r).publish(getCommitList(r), getBuildColor(r));
-                }
+                    message = message + "\n" + getCommitList(r);
+                }            
+                getSlack(r).publish(message, getBuildColor(r));
             }
         }
     }
@@ -141,11 +142,12 @@ public void completed(AbstractBuild r) {
                         && notifier.getNotifyBackToNormal())
                     || (result == Result.SUCCESS && notifier.getNotifySuccess())
                     || (result == Result.UNSTABLE && notifier.getNotifyUnstable())) {
-                getSlack(r).publish(getBuildStatusMessage(r, notifier.getIncludeTestSummary(),
-                        notifier.getIncludeFailedTests(), notifier.getIncludeCustomMessage()), getBuildColor(r));
+                String message = getBuildStatusMessage(r, notifier.getIncludeTestSummary(),
+                        notifier.getIncludeFailedTests(), notifier.getIncludeCustomMessage());
                 if (notifier.getCommitInfoChoice().showAnything()) {
-                    getSlack(r).publish(getCommitList(r), getBuildColor(r));
+                    message = message + "\n" + getCommitList(r);
                 }
+                getSlack(r).publish(message, getBuildColor(r));
             }
         }
     }