From 3979811ad4834c30ab72a67a0e2f60639a9a4ea5 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 11 Feb 2021 17:42:30 +0000 Subject: [PATCH 1/2] [CI] Use the releaseNotification step --- .ci/Jenkinsfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 10efa4e8b..ddeef0afd 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -477,11 +477,12 @@ def askAndWait(message) { } def notifyStatus(def args = [:]) { - slackSend(channel: env.SLACK_CHANNEL, color: args.slackStatus, message: "${args.subject}. ${args.body}", - tokenCredentialId: 'jenkins-slack-integration-token') - // transform slack URL format '()' to 'URL'. - def bodyEmail = args.body.replaceAll('\\(<', '').replaceAll('\\|.*>\\)', '') - emailext(subject: args.subject, to: "${env.NOTIFY_TO}", body: bodyEmail) + releaseNotification(slackChannel: "${env.env.SLACK_CHANNEL}", + slackColor: args.slackStatus, + slackCredentialsId: 'jenkins-slack-integration-token', + to: "${env.NOTIFY_TO}", + subject: args.subject, + body: args.body) } def prepareRelease() { From fc88ef15dc6fd024a71b76eda5b27874b7e42f8d Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 11 Feb 2021 17:50:12 +0000 Subject: [PATCH 2/2] Fix typo --- .ci/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index ddeef0afd..7d87e91f8 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -477,7 +477,7 @@ def askAndWait(message) { } def notifyStatus(def args = [:]) { - releaseNotification(slackChannel: "${env.env.SLACK_CHANNEL}", + releaseNotification(slackChannel: "${env.SLACK_CHANNEL}", slackColor: args.slackStatus, slackCredentialsId: 'jenkins-slack-integration-token', to: "${env.NOTIFY_TO}",