From 92eb4538fb3e7a3c114fa20363af082605e18da3 Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 8 Jan 2026 13:08:02 +0000 Subject: [PATCH] Update apps/demo-nginx/Jenkinsfile --- apps/demo-nginx/Jenkinsfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/demo-nginx/Jenkinsfile b/apps/demo-nginx/Jenkinsfile index d325413..e4dd897 100644 --- a/apps/demo-nginx/Jenkinsfile +++ b/apps/demo-nginx/Jenkinsfile @@ -291,10 +291,10 @@ EOF stage('Wait for ArgoCD Sync') { steps { script { - echo "⏳ Waiting for ArgoCD to apply Git revision..." + echo "⏳ Waiting for ArgoCD to apply GitOps revision..." def expectedRevision = sh( - script: "git rev-parse HEAD", + script: "git -C k3s-gitops rev-parse HEAD", returnStdout: true ).trim() @@ -309,19 +309,19 @@ 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 revision" return } sleep 10 } - error("❌ ArgoCD did not apply expected Git revision in time") + error("❌ ArgoCD did not apply expected GitOps revision in time") } } } @@ -329,6 +329,7 @@ EOF + stage('Wait for Deployment') { when { branch 'main' }