Merge pull request 'develop' (#11) from develop into prod

Reviewed-on: #11

Jenkinsfile

@@ -4,87 +4,110 @@ pipeline {
 
 options {
     buildDiscarder(logRotator(numToKeepStr: '10'))
-    }
+    disableConcurrentBuilds()
-
-    environment {
-        DEPLOY_PATH = getDeployPath()
-        ENV_FILE_ID = getEnvFileId()
-        TARGET_URL = getHealthUrl()
 }
 
 stages {
 
-        stage('Checkout') {
+    stage('Build') {
         agent { label getAgentLabel() }
+
+        stages {
+
+            stage('Cleanup Workspace') {
+                steps {
+                    cleanWs()
+                }
+            }
+
+            stage('Checkout') {
                 steps {
                     checkout scm
                 }
             }
 
             stage('Inject Environment File') {
-            agent { label getAgentLabel() }
                 steps {
                     configFileProvider(
                         [configFile(
-                        fileId: ENV_FILE_ID,
+                            fileId: getEnvFileId(),
                             targetLocation: 'src/environments/environment.ts',
                             replaceTokens: true
                         )]
                     ) {
-                    echo "Environment file injected for ${env.BRANCH_NAME}"
+                        echo "Injected environment for ${env.BRANCH_NAME}"
                     }
                 }
             }
 
-        stage('Build Angular') {
+            stage('Install & Build') {
-            agent { label getAgentLabel() }
                 steps {
                     sh '''
-                npm install
+                    npm ci
                     ng build --configuration production --base-href /admin/
                     '''
                 }
             }
+        }
+    }
+
+    // 🚨 Production Approval Gate
+    stage('Production Approval') {
+        when {
+            branch 'prod'
+        }
+        steps {
+            input message: "Approve deployment to PRODUCTION?", ok: "Deploy"
+        }
+    }
+
+    stage('Deploy & Verify') {
+        agent { label getAgentLabel() }
+
+        stages {
 
             stage('Deploy') {
-            agent { label getAgentLabel() }
                 steps {
-                sh '''
+                    sh """
-                rm -rf $DEPLOY_PATH/*
+                    rsync -av --delete dist/portfolio-admin/browser/ ${getDeployPath()}/
-                cp -r dist/portfolio-admin/browser/* $DEPLOY_PATH/
                     sudo /usr/bin/systemctl reload nginx
-                '''
+                    """
                 }
             }
 
             stage('Health Check') {
-            agent { label getAgentLabel() }
                 steps {
                     sh """
-                sleep 2
+                    sleep 3
-                curl -f ${TARGET_URL}
+                    curl -f ${getHealthUrl()}
                     """
                 }
             }
+
+        }
+    }
 }
 
 post {
-        failure {
-            echo "Deployment failed!"
-        }
     success {
-            echo "Deployment successful!"
+        echo "✅ Deployment successful for ${env.BRANCH_NAME}"
     }
+    failure {
+        echo "❌ Deployment failed for ${env.BRANCH_NAME}"
     }
 }
 
+}
+
+//
 // -------- Helper Methods --------
+//
 
 def getAgentLabel() {
 if (env.BRANCH_NAME == 'prod') {
-        return 'oracle-node'
+return 'oracle-prod'
 } else {
-        return 'built-in'   // for develop
+return 'built-in'
 }
 }