From b807e0e0b28f69ab338c231ab252ead51453b587 Mon Sep 17 00:00:00 2001
From: thienqb123456 <thienqb123456@gmail.com>
Date: Tue, 24 Dec 2024 18:00:31 +0700
Subject: [PATCH] Thienvv -

---
 be/be-acp/ci-acp-backend.Jenkinsfile       |  8 ++++----
 be/be-portal/ci-portal-backend.Jenkinsfile | 14 ++++++++------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/be/be-acp/ci-acp-backend.Jenkinsfile b/be/be-acp/ci-acp-backend.Jenkinsfile
index 1bddd34..8d2c60f 100644
--- a/be/be-acp/ci-acp-backend.Jenkinsfile
+++ b/be/be-acp/ci-acp-backend.Jenkinsfile
@@ -122,10 +122,10 @@ pipeline {
         }
         success {
             echo "Job '${env.JOB_NAME}' completed successfully. Attempting to trigger Job '${TRIGGER_JOB_NAME}'..."
-
-            def message = "Build thành công : API - Môi trường ${params.ENV} - Dự án ${env.PROJECT_NAME} ${currentBuild.fullDisplayName}\n${env.BUILD_URL} \n Đang tiến hành Deploy...!"
-            sh "curl -s -X POST https://api.telegram.org/bot${env.TELEGRAM_BOT_TOKEN}/sendMessage -d chat_id=${env.TELEGRAM_CHAT_ID} -d text=\"${message}\""
-
+            script {
+                def message = "Build thành công : API - Môi trường ${params.ENV} - Dự án ${env.PROJECT_NAME} ${currentBuild.fullDisplayName}\n${env.BUILD_URL} \n Đang tiến hành Deploy...!"
+                sh "curl -s -X POST https://api.telegram.org/bot${env.TELEGRAM_BOT_TOKEN}/sendMessage -d chat_id=${env.TELEGRAM_CHAT_ID} -d text=\"${message}\""
+            }
             script {
                 try {
                     def buildResult = build job: "${TRIGGER_JOB_NAME}", parameters:[
diff --git a/be/be-portal/ci-portal-backend.Jenkinsfile b/be/be-portal/ci-portal-backend.Jenkinsfile
index 1b1d1ac..bff1a88 100644
--- a/be/be-portal/ci-portal-backend.Jenkinsfile
+++ b/be/be-portal/ci-portal-backend.Jenkinsfile
@@ -124,8 +124,10 @@ pipeline {
         }
         success {
             echo "Job '${env.JOB_NAME}' completed successfully. Attempting to trigger Job '${TRIGGER_JOB_NAME}'..."
-            def message = "Build thành công : API - Môi trường ${params.ENV} - Dự án ${env.PROJECT_NAME} ${currentBuild.fullDisplayName}\n${env.BUILD_URL} \n Đang tiến hành Deploy...!"
-            sh "curl -s -X POST https://api.telegram.org/bot${env.TELEGRAM_BOT_TOKEN}/sendMessage -d chat_id=${env.TELEGRAM_CHAT_ID} -d text=\"${message}\""
+            script {
+                def message = "Build thành công : API - Môi trường ${params.ENV} - Dự án ${env.PROJECT_NAME} ${currentBuild.fullDisplayName}\n${env.BUILD_URL} \n Đang tiến hành Deploy...!"
+                sh "curl -s -X POST https://api.telegram.org/bot${env.TELEGRAM_BOT_TOKEN}/sendMessage -d chat_id=${env.TELEGRAM_CHAT_ID} -d text=\"${message}\""
+            }
             script {
                 try {
                     def buildResult = build job: "${TRIGGER_JOB_NAME}", parameters:[
@@ -146,12 +148,12 @@ pipeline {
 
         failure {
             failure {
-            script {
-                def message = "Build thất bại: API - Môi trường ${params.ENV} - Dự án ${env.PROJECT_NAME}, ${currentBuild.fullDisplayName}\n Kiểm tra tại đây ${env.BUILD_URL}."
-                sh "curl -s -X POST https://api.telegram.org/bot${env.TELEGRAM_BOT_TOKEN}/sendMessage -d chat_id=${env.TELEGRAM_CHAT_ID} -d text=\"${message}\""
+                script {
+                    def message = "Build thất bại: API - Môi trường ${params.ENV} - Dự án ${env.PROJECT_NAME}, ${currentBuild.fullDisplayName}\n Kiểm tra tại đây ${env.BUILD_URL}."
+                    sh "curl -s -X POST https://api.telegram.org/bot${env.TELEGRAM_BOT_TOKEN}/sendMessage -d chat_id=${env.TELEGRAM_CHAT_ID} -d text=\"${message}\""
+                }
             }
         }
-        }
     }
 }