From 87de8b0ee2725115d1786ca1a9c8c2f4329b70a2 Mon Sep 17 00:00:00 2001
From: thienqb123456 <thienqb123456@gmail.com>
Date: Sat, 1 Mar 2025 02:07:21 +0700
Subject: [PATCH] Thienv - tach nhan p7

---
 .../ci-beta-portal-frontend.Jenkinsfile       | 24 +++++++++++++++++--
 .../ci-uat-portal-frontend.Jenkinsfile        |  8 +++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/fe/fe-portal/ci-beta-portal-frontend.Jenkinsfile b/fe/fe-portal/ci-beta-portal-frontend.Jenkinsfile
index 6b866ec..533ded6 100644
--- a/fe/fe-portal/ci-beta-portal-frontend.Jenkinsfile
+++ b/fe/fe-portal/ci-beta-portal-frontend.Jenkinsfile
@@ -7,7 +7,9 @@ pipeline {
     environment {
         GIT_CREDENTIALSID = 'b03f36c4-bba3-4764-94ca-b620651b2a68'
         GIT_URL = 'http://work.gct.com.vn/anhln/PORTAL_2025.git'
-        GIT_BRANCH = 'main'
+        
+        GIT_KTDT_BRANCH = 'beta_kinhtedothi'
+        GIT_HNT_BRANCH = 'beta_hanoitimes'
 
         ENV = 'beta'
         PROJECT_NAME = 'portal'
@@ -38,10 +40,28 @@ pipeline {
         TELEGRAM_BOT_TOKEN = credentials('TELEGRAM_BOT_TOKEN')
     }
     stages {
+        stage('Configure GIT_BRANCH') {
+            steps {
+                script {
+                    switch (params.PORTAL_NAME) {
+                        case 'ktdt':
+                            env.GIT_BRANCHO = env.GIT_KTDT_BRANCH
+                            break
+                        case 'hnt':
+                            env.GIT_BRANCHO = env.GIT_HNT_BRANCH
+                            break
+                        default:
+                            error "Unsupported PORTAL_NAME: ${params.PORTAL_NAME}"
+                    }
+                }
+                echo "Branch được thiết lập là: ${env.GIT_BRANCHO}"
+            }
+        }
+
         stage('Checkout') {
             steps {
                 // Checkout mã nguồn từ Gitea
-                checkoutFromGit(env.GIT_URL as String, env.GIT_CREDENTIALSID as String, env.GIT_BRANCH as String)
+                checkoutFromGit(env.GIT_URL as String, env.GIT_CREDENTIALSID as String, env.GIT_BRANCHO as String)
             }
         }
 
diff --git a/fe/fe-portal/ci-uat-portal-frontend.Jenkinsfile b/fe/fe-portal/ci-uat-portal-frontend.Jenkinsfile
index 9916eed..ca0ae8b 100644
--- a/fe/fe-portal/ci-uat-portal-frontend.Jenkinsfile
+++ b/fe/fe-portal/ci-uat-portal-frontend.Jenkinsfile
@@ -8,8 +8,8 @@ pipeline {
         GIT_CREDENTIALSID = 'b03f36c4-bba3-4764-94ca-b620651b2a68'
         GIT_URL = 'http://work.gct.com.vn/anhln/PORTAL_2025.git'
 
-        KTDT_BRANCH = 'uat_kinhtedothi'
-        HNT_BRANCH = 'uat_hanoitimes'
+        GIT_KTDT_BRANCH = 'uat_kinhtedothi'
+        GIT_HNT_BRANCH = 'uat_hanoitimes'
 
         ENV = 'uat'
         PROJECT_NAME = 'portal'
@@ -45,10 +45,10 @@ pipeline {
                 script {
                     switch (params.PORTAL_NAME) {
                         case 'ktdt':
-                            env.GIT_BRANCHO = env.KTDT_BRANCH
+                            env.GIT_BRANCHO = env.GIT_KTDT_BRANCH
                             break
                         case 'hnt':
-                            env.GIT_BRANCHO = env.HNT_BRANCH
+                            env.GIT_BRANCHO = env.GIT_HNT_BRANCH
                             break
                         default:
                             error "Unsupported PORTAL_NAME: ${params.PORTAL_NAME}"