From 665b5baeed160256dbbb8aeea724b41158570364 Mon Sep 17 00:00:00 2001
From: Raphael Defosseux <raphael.defosseux@eurecom.fr>
Date: Wed, 2 Nov 2022 15:22:26 +0100
Subject: [PATCH] feat(ci): transition the Slack notification from old pipeline
 to container-based pipeline.  * Also added a parameter for the registry push
 pipeline.    Valid mainly when triggering manually the pipeline when run on
 develop fails.  * Nicer message2 construction

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
---
 ci-scripts/Jenkinsfile-GitLab-Container | 14 ++++++++++++++
 ci-scripts/Jenkinsfile-gitlab           | 18 ------------------
 ci-scripts/Jenkinsfile-push-registry    |  6 ++++++
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/ci-scripts/Jenkinsfile-GitLab-Container b/ci-scripts/Jenkinsfile-GitLab-Container
index b949584830..31ea662e3c 100644
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -449,6 +449,10 @@ pipeline {
         def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): passed (" + BUILD_URL + ")"
         if ("MERGE".equals(env.gitlabActionType)) {
           addGitLabMRComment comment: message
+          def message2 = message + " -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
+          sendSocialMediaMessage('ci-enb', 'good', message2)
+        } else {
+          sendSocialMediaMessage('ci-enb', 'good', message)
         }
         echo "Pipeline is SUCCESSFUL"
       }
@@ -458,6 +462,10 @@ pipeline {
         def message = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): failed (" + BUILD_URL + ")"
         if ("MERGE".equals(env.gitlabActionType)) {
           addGitLabMRComment comment: message
+          def message2 = message + " -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
+          sendSocialMediaMessage('ci-enb', 'danger', message2)
+        } else {
+          sendSocialMediaMessage('ci-enb', 'danger', message)
         }
         echo "Pipeline FAILED"
       }
@@ -541,3 +549,9 @@ def finalizeSlaveJob(jobName) {
     }
   }
 }
+
+// Abstraction function to send social media messages:
+// like on Slack or Mattermost
+def sendSocialMediaMessage(pipeChannel, pipeColor, pipeMessage) {
+  slackSend channel: pipeChannel, color: pipeColor, message: pipeMessage
+}
diff --git a/ci-scripts/Jenkinsfile-gitlab b/ci-scripts/Jenkinsfile-gitlab
index 405bd0f4d6..cc35cb4625 100644
--- a/ci-scripts/Jenkinsfile-gitlab
+++ b/ci-scripts/Jenkinsfile-gitlab
@@ -20,16 +20,6 @@
  *      contact@openairinterface.org
  */
 
-// Abstraction function to send social media messages:
-// like on Slack or Mattermost
-def sendSocialMediaMessage(pipeChannel, pipeColor, pipeMessage) {
-    if (params.pipelineUsesSlack != null) {
-        if (params.pipelineUsesSlack) {
-            slackSend channel: pipeChannel, color: pipeColor, message: pipeMessage
-        }
-    }
-}
-
 // Location of the executor node
 def nodeExecutor = params.nodeExecutor
 
@@ -389,10 +379,6 @@ OAI CI Team''',
                 if ("MERGE".equals(env.gitlabActionType)) {
                     echo "This is a MERGE event"
                     addGitLabMRComment comment: message
-                    def message2 = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): passed (" + BUILD_URL + ") -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
-                    sendSocialMediaMessage('ci-enb', 'good', message2)
-                } else {
-                    sendSocialMediaMessage('ci-enb', 'good', message)
                 }
             }
         }
@@ -402,10 +388,6 @@ OAI CI Team''',
                 if ("MERGE".equals(env.gitlabActionType)) {
                     echo "This is a MERGE event"
                     addGitLabMRComment comment: message
-                    def message2 = "OAI " + JOB_NAME + " build (" + BUILD_ID + "): failed (" + BUILD_URL + ") -- MergeRequest #" + env.gitlabMergeRequestIid + " (" + env.gitlabMergeRequestTitle + ")"
-                    sendSocialMediaMessage('ci-enb', 'danger', message2)
-                } else {
-                    sendSocialMediaMessage('ci-enb', 'danger', message)
                 }
             }
         }
diff --git a/ci-scripts/Jenkinsfile-push-registry b/ci-scripts/Jenkinsfile-push-registry
index dda0c5caa1..24855deb22 100644
--- a/ci-scripts/Jenkinsfile-push-registry
+++ b/ci-scripts/Jenkinsfile-push-registry
@@ -65,6 +65,12 @@ pipeline {
           WEEK_REF = WEEK_REF.trim()
           WEEK_TAG = sh returnStdout: true, script: 'python3 ./ci-scripts/provideUniqueImageTag.py --start_tag ' + WEEK_REF
           WEEK_TAG = WEEK_TAG.trim()
+          if ((params.forceTag != null) && (params.tagToUse != null)) {
+            if (params.forceTag) {
+              WEEK_TAG = params.tagToUse
+              echo "Forced Tag is ${WEEK_TAG}"
+            }
+          }
           WEEK_SHA = sh returnStdout: true, script: 'git log -n1 --pretty=format:"%h" origin/develop | cut -c 1-8'
           WEEK_SHA = WEEK_SHA.trim()