admin/k3s-gitops
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update apps/demo-nginx/Jenkinsfile

Browse Source
This commit is contained in:
admin
2026-01-08 11:02:13 +00:00
parent 6dd9ab6cd7
commit 26d0ecfaff
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/demo-nginx/Jenkinsfile vendored
View File

@@ -291,12 +291,9 @@ EOF
stage('Wait for ArgoCD Sync') { stage('Wait for ArgoCD Sync') {
steps { steps {
script { script {
echo "⏳ Waiting for ArgoCD to apply Git revision..." echo "⏳ Waiting for ArgoCD to apply GitOps commit..."
def expectedRevision = sh( def expectedRevision = env.GITOPS_COMMIT
script: "git rev-parse HEAD",
returnStdout: true
).trim()
for (int i = 1; i <= 12; i++) { for (int i = 1; i <= 12; i++) {
def argoRevision = sh( def argoRevision = sh(
@@ -309,24 +306,25 @@ EOF
returnStdout: true returnStdout: true
).trim() ).trim()
echo "Expected Git revision : ${expectedRevision}" echo "Expected GitOps revision : ${expectedRevision}"
echo "ArgoCD applied revision: ${argoRevision}" echo "ArgoCD applied revision : ${argoRevision}"
echo "ArgoCD sync status : ${syncStatus}" echo "ArgoCD sync status : ${syncStatus}"
if (syncStatus == "Synced" && argoRevision == expectedRevision) { if (syncStatus == "Synced" && argoRevision == expectedRevision) {
echo "✅ ArgoCD successfully applied Git revision" echo "✅ ArgoCD successfully applied GitOps commit"
return return
} }
sleep 10 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') { stage('Wait for Deployment') {
when { branch 'main' } when { branch 'main' }
steps { steps {