From 261404dd72337a208fd29f0e64fc30dc805ebdc0 Mon Sep 17 00:00:00 2001
From: John Hanzu Kim <kros235@naver.com>
Date: Thu, 19 Jun 2025 14:59:27 +0900
Subject: [PATCH 1/4] Update Jenkinsfile

---
 smarketing-java/deployment/Jenkinsfile | 48 ++++++++++++--------------
 1 file changed, 23 insertions(+), 25 deletions(-)

diff --git a/smarketing-java/deployment/Jenkinsfile b/smarketing-java/deployment/Jenkinsfile
index f0b3ad3..e22b768 100644
--- a/smarketing-java/deployment/Jenkinsfile
+++ b/smarketing-java/deployment/Jenkinsfile
@@ -194,11 +194,11 @@ podTemplate(
                                 git add .
                                 git commit -m "Update SMarketing services to ${imageTag}
                                 
-                                Services updated:
-                                ${services.collect { "- ${it}: ${props.registry}/${props.image_org}/${it}:${imageTag}" }.join('\n')}
-                                
-                                Build: ${env.BUILD_NUMBER}
-                                Commit: ${env.GIT_COMMIT}"
+Services updated:
+${services.collect { "- ${it}: ${props.registry}/${props.image_org}/${it}:${imageTag}" }.join('\n')}
+
+Build: ${env.BUILD_NUMBER}
+Commit: ${env.GIT_COMMIT}"
                                 
                                 git push origin main
                                 echo "✅ Successfully updated manifest repository"
@@ -212,23 +212,21 @@ podTemplate(
         }
 
         stage('Trigger ArgoCD Sync') {
-            steps {
-                script {
-                    echo """
-                    🎯 CI Pipeline 완료!
-                    
-                    📦 빌드된 이미지들:
-                    ${services.collect { "- ${props.registry}/${props.image_org}/${it}:${imageTag}" }.join('\n')}
-                    
-                    🔄 ArgoCD 동작:
-                    - ArgoCD가 manifest repository 변경사항을 자동으로 감지합니다
-                    - 각 서비스별 Application이 새로운 이미지로 동기화됩니다
-                    - ArgoCD UI에서 배포 상태를 모니터링하세요
-                    
-                    🌐 ArgoCD UI: [ArgoCD 접속 URL]
-                    📁 Manifest Repo: ${MANIFEST_REPO}
-                    """
-                }
+            script {
+                echo """
+🎯 CI Pipeline 완료!
+
+📦 빌드된 이미지들:
+${services.collect { "- ${props.registry}/${props.image_org}/${it}:${imageTag}" }.join('\n')}
+
+🔄 ArgoCD 동작:
+- ArgoCD가 manifest repository 변경사항을 자동으로 감지합니다
+- 각 서비스별 Application이 새로운 이미지로 동기화됩니다
+- ArgoCD UI에서 배포 상태를 모니터링하세요
+
+🌐 ArgoCD UI: [ArgoCD 접속 URL]
+📁 Manifest Repo: ${MANIFEST_REPO}
+                """
             }
         }
     }
@@ -242,9 +240,9 @@ podTemplate(
         }
         success {
             echo """
-            ✅ CI Pipeline 성공!
-            🏷️ 새로운 이미지 태그: ${imageTag}
-            🔄 ArgoCD가 자동으로 배포를 시작합니다
+✅ CI Pipeline 성공!
+🏷️ 새로운 이미지 태그: ${imageTag}
+🔄 ArgoCD가 자동으로 배포를 시작합니다
             """
         }
         failure {

From ca5b4166e3b17015153866a9aaba6556a86fe959 Mon Sep 17 00:00:00 2001
From: John Hanzu Kim <kros235@naver.com>
Date: Thu, 19 Jun 2025 15:08:37 +0900
Subject: [PATCH 2/4] Update Jenkinsfile

---
 smarketing-java/deployment/Jenkinsfile | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/smarketing-java/deployment/Jenkinsfile b/smarketing-java/deployment/Jenkinsfile
index e22b768..0b65cc1 100644
--- a/smarketing-java/deployment/Jenkinsfile
+++ b/smarketing-java/deployment/Jenkinsfile
@@ -193,13 +193,7 @@ podTemplate(
                             if [ -n "\$(git status --porcelain)" ]; then
                                 git add .
                                 git commit -m "Update SMarketing services to ${imageTag}
-                                
-Services updated:
-${services.collect { "- ${it}: ${props.registry}/${props.image_org}/${it}:${imageTag}" }.join('\n')}
-
-Build: ${env.BUILD_NUMBER}
-Commit: ${env.GIT_COMMIT}"
-                                
+                                                                
                                 git push origin main
                                 echo "✅ Successfully updated manifest repository"
                             else

From 458be8df697c88ee9008356ce34db0aa9435188b Mon Sep 17 00:00:00 2001
From: John Hanzu Kim <kros235@naver.com>
Date: Thu, 19 Jun 2025 15:17:21 +0900
Subject: [PATCH 3/4] Update Jenkinsfile

---
 smarketing-java/deployment/Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/smarketing-java/deployment/Jenkinsfile b/smarketing-java/deployment/Jenkinsfile
index 0b65cc1..75af95c 100644
--- a/smarketing-java/deployment/Jenkinsfile
+++ b/smarketing-java/deployment/Jenkinsfile
@@ -192,8 +192,7 @@ podTemplate(
                             # 변경사항이 있으면 커밋 및 푸시
                             if [ -n "\$(git status --porcelain)" ]; then
                                 git add .
-                                git commit -m "Update SMarketing services to ${imageTag}
-                                                                
+                                git commit -m "Update SMarketing services to ${imageTag} - Build ${env.BUILD_NUMBER}"
                                 git push origin main
                                 echo "✅ Successfully updated manifest repository"
                             else

From f53974812ce47e5ad9ca25c95c790461147d8f1f Mon Sep 17 00:00:00 2001
From: John Hanzu Kim <kros235@naver.com>
Date: Thu, 19 Jun 2025 15:25:06 +0900
Subject: [PATCH 4/4] Update Jenkinsfile

---
 smarketing-java/deployment/Jenkinsfile | 327 +++++++++++++------------
 1 file changed, 164 insertions(+), 163 deletions(-)

diff --git a/smarketing-java/deployment/Jenkinsfile b/smarketing-java/deployment/Jenkinsfile
index 75af95c..821ed02 100644
--- a/smarketing-java/deployment/Jenkinsfile
+++ b/smarketing-java/deployment/Jenkinsfile
@@ -1,4 +1,4 @@
-// smarketing-backend/smarketing-java/deployment/Jenkinsfile_ArgoCD
+// smarketing-backend/smarketing-java/deployment/Jenkinsfile
 
 def PIPELINE_ID = "${env.BUILD_NUMBER}"
 
@@ -30,183 +30,184 @@ podTemplate(
         def MANIFEST_REPO = 'https://github.com/won-ktds/smarketing-manifest.git'
         def MANIFEST_CREDENTIAL_ID = 'github-credentials-smarketing'
 
-        stage("Get Source") {
-            checkout scm
-            
-            // smarketing-java 하위에 있는 설정 파일 읽기
-            props = readProperties file: "smarketing-java/deployment/deploy_env_vars"
+        try {
+            stage("Get Source") {
+                checkout scm
+                
+                // smarketing-java 하위에 있는 설정 파일 읽기
+                props = readProperties file: "smarketing-java/deployment/deploy_env_vars"
 
-            echo "=== Build Information ==="
-            echo "Services: ${services}"
-            echo "Image Tag: ${imageTag}"
-            echo "Registry: ${props.registry}"
-            echo "Image Org: ${props.image_org}"
-        }
+                echo "=== Build Information ==="
+                echo "Services: ${services}"
+                echo "Image Tag: ${imageTag}"
+                echo "Registry: ${props.registry}"
+                echo "Image Org: ${props.image_org}"
+            }
 
-        stage("Check Changes") {
-            script {
-                def changes = sh(
-                    script: "git diff --name-only HEAD~1 HEAD",
-                    returnStdout: true
-                ).trim()
+            stage("Check Changes") {
+                script {
+                    def changes = sh(
+                        script: "git diff --name-only HEAD~1 HEAD",
+                        returnStdout: true
+                    ).trim()
 
-                if (!changes.contains("smarketing-java/")) {
-                    echo "No changes in smarketing-java, skipping build"
-                    currentBuild.result = 'SUCCESS'
-                    error("Stopping pipeline - no changes detected")
+                    if (!changes.contains("smarketing-java/")) {
+                        echo "No changes in smarketing-java, skipping build"
+                        currentBuild.result = 'SUCCESS'
+                        error("Stopping pipeline - no changes detected")
+                    }
+
+                    echo "Changes detected in smarketing-java, proceeding with build"
                 }
-
-                echo "Changes detected in smarketing-java, proceeding with build"
             }
-        }
 
-        stage('Build Applications') {
-            container('gradle') {
-                sh """
-                    echo "=== smarketing-java 디렉토리로 이동 ==="
-                    cd smarketing-java
-                    
-                    echo "=== gradlew 권한 설정 ==="
-                    chmod +x gradlew
-                    
-                    echo "=== 전체 서비스 빌드 ==="
-                    ./gradlew :member:clean :member:build -x test
-                    ./gradlew :store:clean :store:build -x test
-                    ./gradlew :marketing-content:clean :marketing-content:build -x test
-                    ./gradlew :ai-recommend:clean :ai-recommend:build -x test
-                    
-                    echo "=== 빌드 결과 확인 ==="
-                    find . -name "*.jar" -path "*/build/libs/*" | grep -v 'plain.jar'
-                """
-            }
-        }
-
-        stage('Build & Push Images') {
-            container('docker') {
-                sh """
-                    echo "=== Docker 데몬 시작 대기 ==="
-                    timeout 30 sh -c 'until docker info; do sleep 1; done'
-                """
-
-                // ACR Credential을 Jenkins에서 직접 사용
-                withCredentials([usernamePassword(
-                    credentialsId: 'acr-credentials',
-                    usernameVariable: 'ACR_USERNAME',
-                    passwordVariable: 'ACR_PASSWORD'
-                )]) {
+            stage('Build Applications') {
+                container('gradle') {
                     sh """
-                        echo "=== Docker로 ACR 로그인 ==="
-                        echo "\$ACR_PASSWORD" | docker login ${props.registry} --username \$ACR_USERNAME --password-stdin
+                        echo "=== smarketing-java 디렉토리로 이동 ==="
+                        cd smarketing-java
+                        
+                        echo "=== gradlew 권한 설정 ==="
+                        chmod +x gradlew
+                        
+                        echo "=== 전체 서비스 빌드 ==="
+                        ./gradlew :member:clean :member:build -x test
+                        ./gradlew :store:clean :store:build -x test
+                        ./gradlew :marketing-content:clean :marketing-content:build -x test
+                        ./gradlew :ai-recommend:clean :ai-recommend:build -x test
+                        
+                        echo "=== 빌드 결과 확인 ==="
+                        find . -name "*.jar" -path "*/build/libs/*" | grep -v 'plain.jar'
+                    """
+                }
+            }
+
+            stage('Build & Push Images') {
+                container('docker') {
+                    sh """
+                        echo "=== Docker 데몬 시작 대기 ==="
+                        timeout 30 sh -c 'until docker info; do sleep 1; done'
                     """
 
-                    services.each { service ->
-                        script {
-                            def buildDir = "smarketing-java/${service}"
-                            def fullImageName = "${props.registry}/${props.image_org}/${service}:${imageTag}"
+                    // ACR Credential을 Jenkins에서 직접 사용
+                    withCredentials([usernamePassword(
+                        credentialsId: 'acr-credentials',
+                        usernameVariable: 'ACR_USERNAME',
+                        passwordVariable: 'ACR_PASSWORD'
+                    )]) {
+                        sh """
+                            echo "=== Docker로 ACR 로그인 ==="
+                            echo "\$ACR_PASSWORD" | docker login ${props.registry} --username \$ACR_USERNAME --password-stdin
+                        """
 
-                            echo "Building image for ${service}: ${fullImageName}"
-                            
-                            // 실제 JAR 파일명 동적 탐지
-                            def actualJarFile = sh(
-                                script: """
-                                    cd ${buildDir}/build/libs
-                                    ls *.jar | grep -v 'plain.jar' | head -1
-                                """,
-                                returnStdout: true
-                            ).trim()
-                            
-                            if (!actualJarFile) {
-                                error "${service} JAR 파일을 찾을 수 없습니다"
-                            }
-                            
-                            echo "발견된 JAR 파일: ${actualJarFile}"
+                        services.each { service ->
+                            script {
+                                def buildDir = "smarketing-java/${service}"
+                                def fullImageName = "${props.registry}/${props.image_org}/${service}:${imageTag}"
 
-                            sh """
-                                echo "=== ${service} 이미지 빌드 ==="
-                                docker build \\
-                                    --build-arg BUILD_LIB_DIR="${buildDir}/build/libs" \\
-                                    --build-arg ARTIFACTORY_FILE="${actualJarFile}" \\
-                                    -f smarketing-java/deployment/container/Dockerfile \\
-                                    -t ${fullImageName} .
-
-                                echo "=== ${service} 이미지 푸시 ==="
-                                docker push ${fullImageName}
+                                echo "Building image for ${service}: ${fullImageName}"
                                 
-                                echo "Successfully built and pushed: ${fullImageName}"
-                            """
+                                // 실제 JAR 파일명 동적 탐지
+                                def actualJarFile = sh(
+                                    script: """
+                                        cd ${buildDir}/build/libs
+                                        ls *.jar | grep -v 'plain.jar' | head -1
+                                    """,
+                                    returnStdout: true
+                                ).trim()
+                                
+                                if (!actualJarFile) {
+                                    error "${service} JAR 파일을 찾을 수 없습니다"
+                                }
+                                
+                                echo "발견된 JAR 파일: ${actualJarFile}"
+
+                                sh """
+                                    echo "=== ${service} 이미지 빌드 ==="
+                                    docker build \\
+                                        --build-arg BUILD_LIB_DIR="${buildDir}/build/libs" \\
+                                        --build-arg ARTIFACTORY_FILE="${actualJarFile}" \\
+                                        -f smarketing-java/deployment/container/Dockerfile \\
+                                        -t ${fullImageName} .
+
+                                    echo "=== ${service} 이미지 푸시 ==="
+                                    docker push ${fullImageName}
+                                    
+                                    echo "Successfully built and pushed: ${fullImageName}"
+                                """
+                            }
                         }
                     }
                 }
             }
-        }
 
-        stage('Update Manifest Repository') {
-            container('git') {
-                script {
-                    // Manifest Repository Clone
-                    withCredentials([usernamePassword(
-                        credentialsId: MANIFEST_CREDENTIAL_ID,
-                        usernameVariable: 'GIT_USERNAME',
-                        passwordVariable: 'GIT_PASSWORD'
-                    )]) {
-                        sh """
-                            echo "=== Git 설정 ==="
-                            git config --global user.name "Jenkins CI"
-                            git config --global user.email "jenkins@company.com"
+            stage('Update Manifest Repository') {
+                container('git') {
+                    script {
+                        // Manifest Repository Clone
+                        withCredentials([usernamePassword(
+                            credentialsId: MANIFEST_CREDENTIAL_ID,
+                            usernameVariable: 'GIT_USERNAME',
+                            passwordVariable: 'GIT_PASSWORD'
+                        )]) {
+                            sh """
+                                echo "=== Git 설정 ==="
+                                git config --global user.name "Jenkins CI"
+                                git config --global user.email "jenkins@company.com"
+                                
+                                echo "=== Manifest Repository Clone ==="
+                                rm -rf manifest-repo
+                                git clone https://\$GIT_USERNAME:\$GIT_PASSWORD@github.com/won-ktds/smarketing-manifest.git manifest-repo
+                                cd manifest-repo
+                            """
                             
-                            echo "=== Manifest Repository Clone ==="
-                            rm -rf manifest-repo
-                            git clone https://\$GIT_USERNAME:\$GIT_PASSWORD@github.com/won-ktds/smarketing-manifest.git manifest-repo
-                            cd manifest-repo
-                        """
-                        
-                        services.each { service ->
-                            def fullImageName = "${props.registry}/${props.image_org}/${service}:${imageTag}"
-                            def deploymentFile = "smarketing/deployments/${service}/${service}-deployment.yaml"
+                            services.each { service ->
+                                def fullImageName = "${props.registry}/${props.image_org}/${service}:${imageTag}"
+                                def deploymentFile = "smarketing/deployments/${service}/${service}-deployment.yaml"
+                                
+                                sh """
+                                    cd manifest-repo
+                                    
+                                    echo "=== ${service} 이미지 태그 업데이트 ==="
+                                    if [ -f "${deploymentFile}" ]; then
+                                        # 이미지 태그 업데이트 (sed 사용)
+                                        sed -i 's|image: ${props.registry}/${props.image_org}/${service}:.*|image: ${fullImageName}|g' "${deploymentFile}"
+                                        echo "Updated ${deploymentFile} with new image: ${fullImageName}"
+                                        
+                                        # 변경사항 확인
+                                        echo "=== 변경된 내용 확인 ==="
+                                        grep "image: ${props.registry}/${props.image_org}/${service}" "${deploymentFile}" || echo "이미지 태그 업데이트 확인 실패"
+                                    else
+                                        echo "Warning: ${deploymentFile} not found"
+                                    fi
+                                """
+                            }
                             
                             sh """
                                 cd manifest-repo
                                 
-                                echo "=== ${service} 이미지 태그 업데이트 ==="
-                                if [ -f "${deploymentFile}" ]; then
-                                    # 이미지 태그 업데이트 (sed 사용)
-                                    sed -i 's|image: ${props.registry}/${props.image_org}/${service}:.*|image: ${fullImageName}|g' "${deploymentFile}"
-                                    echo "Updated ${deploymentFile} with new image: ${fullImageName}"
-                                    
-                                    # 변경사항 확인
-                                    echo "=== 변경된 내용 확인 ==="
-                                    grep "image: ${props.registry}/${props.image_org}/${service}" "${deploymentFile}" || echo "이미지 태그 업데이트 확인 실패"
+                                echo "=== Git 변경사항 확인 ==="
+                                git status
+                                git diff
+                                
+                                # 변경사항이 있으면 커밋 및 푸시
+                                if [ -n "\$(git status --porcelain)" ]; then
+                                    git add .
+                                    git commit -m "Update SMarketing services to ${imageTag} - Build ${env.BUILD_NUMBER}"
+                                    git push origin main
+                                    echo "✅ Successfully updated manifest repository"
                                 else
-                                    echo "Warning: ${deploymentFile} not found"
+                                    echo "ℹ️ No changes to commit"
                                 fi
                             """
                         }
-                        
-                        sh """
-                            cd manifest-repo
-                            
-                            echo "=== Git 변경사항 확인 ==="
-                            git status
-                            git diff
-                            
-                            # 변경사항이 있으면 커밋 및 푸시
-                            if [ -n "\$(git status --porcelain)" ]; then
-                                git add .
-                                git commit -m "Update SMarketing services to ${imageTag} - Build ${env.BUILD_NUMBER}"
-                                git push origin main
-                                echo "✅ Successfully updated manifest repository"
-                            else
-                                echo "ℹ️ No changes to commit"
-                            fi
-                        """
                     }
                 }
             }
-        }
 
-        stage('Trigger ArgoCD Sync') {
-            script {
-                echo """
+            stage('Trigger ArgoCD Sync') {
+                script {
+                    echo """
 🎯 CI Pipeline 완료!
 
 📦 빌드된 이미지들:
@@ -219,27 +220,27 @@ ${services.collect { "- ${props.registry}/${props.image_org}/${it}:${imageTag}"
 
 🌐 ArgoCD UI: [ArgoCD 접속 URL]
 📁 Manifest Repo: ${MANIFEST_REPO}
-                """
+                    """
+                }
             }
-        }
-    }
-    
-    post {
-        always {
-            container('docker') {
-                sh 'docker system prune -f || true'
-            }
-            sh 'rm -rf manifest-repo || true'
-        }
-        success {
+
+            // 성공 시 처리
             echo """
 ✅ CI Pipeline 성공!
 🏷️ 새로운 이미지 태그: ${imageTag}
 🔄 ArgoCD가 자동으로 배포를 시작합니다
             """
-        }
-        failure {
-            echo "❌ CI Pipeline 실패!"
+
+        } catch (Exception e) {
+            // 실패 시 처리
+            echo "❌ CI Pipeline 실패: ${e.getMessage()}"
+            throw e
+        } finally {
+            // 정리 작업 (항상 실행)
+            container('docker') {
+                sh 'docker system prune -f || true'
+            }
+            sh 'rm -rf manifest-repo || true'
         }
     }
 }