diff --git a/apps/demo-nginx/Jenkinsfile b/apps/demo-nginx/Jenkinsfile index f7fc744..723cdfe 100644 --- a/apps/demo-nginx/Jenkinsfile +++ b/apps/demo-nginx/Jenkinsfile @@ -290,35 +290,28 @@ EOF } } - stage('Wait for ArgoCD Sync') { + stage('Wait for ArgoCD Sync') { steps { script { - echo "⏳ Waiting for ArgoCD to apply GitOps image..." - - for (int i = 1; i <= 18; i++) { + echo "⏳ Waiting for ArgoCD to sync manifests..." + for (int i = 1; i <= 12; i++) { def syncStatus = sh( script: "kubectl get application demo-nginx -n argocd -o jsonpath='{.status.sync.status}'", returnStdout: true ).trim() - def images = sh( - script: "kubectl get application demo-nginx -n argocd -o jsonpath='{.status.summary.images}'", - returnStdout: true - ).trim() - echo "ArgoCD sync status : ${syncStatus}" - echo "ArgoCD images : ${images}" - if (syncStatus == "Synced" && images.contains(IMAGE_TAG)) { - echo "✅ ArgoCD successfully applied image ${IMAGE_TAG}" + if (syncStatus == "Synced") { + echo "✅ ArgoCD manifests synced" return } sleep 10 } - error("❌ ArgoCD did not apply image ${IMAGE_TAG} in time") + error("❌ ArgoCD did not sync manifests in time") } } } @@ -330,6 +323,7 @@ EOF + stage('Wait for Deployment') { when { branch 'main' }