Merge pull request #2 from recogni/berend/wip/ci-slack-cleanup

Continuous integration Slack notification cleanup.

Author: berendo

Jenkinsfile

@@ -1,4 +1,4 @@
-def scmVars = [:]
+scmVars = [:]
 
 pipeline {
     agent any
@@ -21,7 +21,7 @@ pipeline {
                     scmVars.GIT_URL = scmVars.GIT_URL.replaceFirst(/\.git$/, "")
                     scmVars.GIT_REPOSITORY = scmVars.GIT_URL.replaceFirst(/^[a-z]+:\/\/[^\/]*\//, "")
                     scmVars.GIT_AUTHOR = sh(script: "${GIT_EXEC_PATH}/git log -1 --pretty=%an ${scmVars.GIT_COMMIT}", returnStdout: true).trim()
-                    scmVars.GIT_MESSAGE = sh(script: "${GIT_EXEC_PATH}/git log -1 --pretty=%B ${scmVars.GIT_COMMIT}", returnStdout: true).trim()
+                    scmVars.GIT_MESSAGE = sh(script: "${GIT_EXEC_PATH}/git log -1 --pretty=%s ${scmVars.GIT_COMMIT}", returnStdout: true).trim()
 
                     scmVars.each { k, v ->
                          env."${k}" = "${v}"
@@ -46,15 +46,17 @@ pipeline {
 
     post {
         success {
-            slackSend(channel: env.SLACK_CHANNEL,
-                      color: "good",
-                      message: "Success: ${scmVars.GIT_AUTHOR.split()[0]}'s build <${currentBuild.absoluteUrl}|${currentBuild.displayName}> in <${scmVars.GIT_URL}|${scmVars.GIT_REPOSITORY}> (<${scmVars.GIT_URL}/commit/${scmVars.GIT_COMMIT}|${scmVars.GIT_COMMIT.substring(0,8)}> on <${scmVars.GIT_URL}/tree/${scmVars.GIT_BRANCH}|${scmVars.GIT_BRANCH}>)\n- ${scmVars.GIT_MESSAGE}")
+            sendSlackMessage("Success", "good")
         }
 
         failure {
-            slackSend(channel: env.SLACK_CHANNEL,
-                      color: "danger",
-                      message: "Failure: ${scmVars.GIT_AUTHOR.split()[0]}'s build <${currentBuild.absoluteUrl}|${currentBuild.displayName}> in <${scmVars.GIT_URL}|${scmVars.GIT_REPOSITORY}> (<${scmVars.GIT_URL}/commit/${scmVars.GIT_COMMIT}|${scmVars.GIT_COMMIT.substring(0,8)}> on <${scmVars.GIT_URL}/tree/${scmVars.GIT_BRANCH}|${scmVars.GIT_BRANCH}>)\n- ${scmVars.GIT_MESSAGE}")
+            sendSlackMessage("Failure", "danger")
         }
     }
 }
+
+void sendSlackMessage(String result = "Success", String color = "good") {
+    slackSend(channel: env.SLACK_CHANNEL,
+              color: color,
+              message: "${result}: ${scmVars.GIT_AUTHOR.split()[0]}'s build <${currentBuild.absoluteUrl}|${currentBuild.displayName}> in <${scmVars.GIT_URL}|${scmVars.GIT_REPOSITORY}> (<${scmVars.GIT_URL}/commit/${scmVars.GIT_COMMIT}|${scmVars.GIT_COMMIT.substring(0,8)}> on <${scmVars.GIT_URL}/tree/${scmVars.GIT_BRANCH}|${scmVars.GIT_BRANCH}>)\n• ${scmVars.GIT_MESSAGE}")
+}