From 26d0ecfaff3fb762c43834add9c16ff28282f85c Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 8 Jan 2026 11:02:13 +0000 Subject: [PATCH] Update apps/demo-nginx/Jenkinsfile --- apps/demo-nginx/Jenkinsfile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/apps/demo-nginx/Jenkinsfile b/apps/demo-nginx/Jenkinsfile index a273180..507a2b9 100644 --- a/apps/demo-nginx/Jenkinsfile +++ b/apps/demo-nginx/Jenkinsfile @@ -291,12 +291,9 @@ EOF stage('Wait for ArgoCD Sync') { steps { script { - echo "⏳ Waiting for ArgoCD to apply Git revision..." + echo "⏳ Waiting for ArgoCD to apply GitOps commit..." - def expectedRevision = sh( - script: "git rev-parse HEAD", - returnStdout: true - ).trim() + def expectedRevision = env.GITOPS_COMMIT for (int i = 1; i <= 12; i++) { def argoRevision = sh( @@ -309,23 +306,24 @@ EOF returnStdout: true ).trim() - echo "Expected Git revision : ${expectedRevision}" - echo "ArgoCD applied revision: ${argoRevision}" - echo "ArgoCD sync status : ${syncStatus}" + echo "Expected GitOps revision : ${expectedRevision}" + echo "ArgoCD applied revision : ${argoRevision}" + echo "ArgoCD sync status : ${syncStatus}" if (syncStatus == "Synced" && argoRevision == expectedRevision) { - echo "✅ ArgoCD successfully applied Git revision" + echo "✅ ArgoCD successfully applied GitOps commit" return } sleep 10 } - error("❌ ArgoCD did not apply expected Git revision in time") + error("❌ ArgoCD did not apply expected GitOps revision in time") } } } + stage('Wait for Deployment') { when { branch 'main' }