From 766257934fb0b6d2cb0cd964b77064b8334e18f7 Mon Sep 17 00:00:00 2001
From: thienqb123456 <thienqb123456@gmail.com>
Date: Tue, 24 Dec 2024 01:52:44 +0700
Subject: [PATCH] Thienvv -

---
 be/be-acp/ci-acp-backend.Jenkinsfile  |  2 +-
 fe/fe-acp/cd-acp-frontend.Jenkinsfile |  1 -
 fe/fe-acp/ci-acp-frontend.Jenkinsfile | 12 +++++-------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/be/be-acp/ci-acp-backend.Jenkinsfile b/be/be-acp/ci-acp-backend.Jenkinsfile
index 037ab91..04be0c0 100644
--- a/be/be-acp/ci-acp-backend.Jenkinsfile
+++ b/be/be-acp/ci-acp-backend.Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
         NUGET_CONFIG_PATH = 'NuGet.config'
         APPLICATIONCORE_PATH = 'Packages'
         JENKINS_BUILD_FOLDER_PATH = 'Acp.WebApi'
-        JENKINS_PUBLISH_FOLDER_PATH = 'publish'
+        JENKINS_PUBLISH_FOLDER_PATH = "${PROJECT_NAME}-publish"
 
         COMPRESSED_FILE_NAME = "${PROJECT_NAME}_publish.zip" // tên file nén
         COMPRESSED_FILE_PATH = "${env.WORKSPACE }/${COMPRESSED_FILE_NAME}"
diff --git a/fe/fe-acp/cd-acp-frontend.Jenkinsfile b/fe/fe-acp/cd-acp-frontend.Jenkinsfile
index 45d0266..d16679e 100644
--- a/fe/fe-acp/cd-acp-frontend.Jenkinsfile
+++ b/fe/fe-acp/cd-acp-frontend.Jenkinsfile
@@ -3,7 +3,6 @@ pipeline {
     parameters {
         choice(name: 'ENV', choices: ['uat', 'prod'], description: 'Choose Environment')
         string(name: 'CI_JOB_BUILD_NUMBER', defaultValue: '', description: 'Build number of CI Job')
-
     }
     environment {
         PROJECT_NAME = 'acp'
diff --git a/fe/fe-acp/ci-acp-frontend.Jenkinsfile b/fe/fe-acp/ci-acp-frontend.Jenkinsfile
index d281899..5d9119e 100644
--- a/fe/fe-acp/ci-acp-frontend.Jenkinsfile
+++ b/fe/fe-acp/ci-acp-frontend.Jenkinsfile
@@ -13,11 +13,10 @@ pipeline {
         METADATA_FILENAME = "${params.ENV}_${PROJECT_NAME}_metadata.json"
 
         NUXT_BUILD_FOLDER_PATH = "${env.WORKSPACE}"
-        OUTPUT_FOLDER_PATH = '.output' // đường dẫn đến .output (sau khi build xong)
+        OUTPUT_FOLDER_PATH = "${params.ENV}-${PROJECT_NAME}-output" //thư mục .output (sau khi build xong)
         COMMAND_NUXT_INSTALL = 'npm install' //command install dependencies
-        
-        COMMAND_NUXT_BUILD_UAT = 'yarn linux-builder' // command build
-        COMMAND_NUXT_BUILD_PROD = 'yarn linux-builder:production' // command build
+        COMMAND_NUXT_BUILD_UAT = "NITRO_OUTPUT=${OUTPUT_FOLDER_PATH} yarn linux-builder" // command build MT uat
+        COMMAND_NUXT_BUILD_PROD = "NITRO_OUTPUT=${OUTPUT_FOLDER_PATH} yarn linux-builder:production" // command build MT prod
 
         COMPRESSED_FILE_NAME = "${params.ENV}_${PROJECT_NAME}_output.zip" // tên file nén
         COMPRESSED_FILE_PATH = "${env.WORKSPACE }/${COMPRESSED_FILE_NAME}"
@@ -67,9 +66,9 @@ pipeline {
             }
         }
 
-        stage('Package (Compress Publish Files)') {
+        stage('Package (Compress Output Files)') {
             steps {
-                compressItems(env.COMPRESSED_FILE_PATH, env.JENKINS_PUBLISH_FOLDER_PATH)
+                compressItems(env.COMPRESSED_FILE_PATH, env.OUTPUT_FOLDER_PATH)
             }
         }
 
@@ -100,7 +99,6 @@ pipeline {
                     env.VERSION,
                     env.NEXUS_URL,
                     env.NEXUS_ARTIFACT_NAME)
-                
                 echo "metadataFileName: ${env.METADATA_FILENAME}"
                 archiveArtifacts artifacts: "${env.METADATA_FILENAME}", allowEmptyArchive: false
             }