Skip to content
Snippets Groups Projects
Commit 97c9ecec authored by Felix Reichenbach's avatar Felix Reichenbach
Browse files

Merge branch 'OZG-7906-gitops-rollout' into 'main'

OZG-7906 fix gitops-rollout

See merge request !18
parents 56242a59 ba2d0d46
No related branches found
No related tags found
1 merge request!18OZG-7906 fix gitops-rollout
...@@ -421,7 +421,7 @@ Void pushNewGitopsVersion(String environment) { ...@@ -421,7 +421,7 @@ Void pushNewGitopsVersion(String environment) {
} }
withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) { withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {
sh "git add ${environment}/application/values/aggregation-manager-values.yaml" sh "git add ${environment}/application/values/aggregation-manager-*-values.yaml"
sh "git commit -m 'jenkins rollout ${environment} aggregation manager version ${IMAGE_TAG}'" sh "git commit -m 'jenkins rollout ${environment} aggregation manager version ${IMAGE_TAG}'"
sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/ozgcloud-devops/gitops.git' sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/ozgcloud-devops/gitops.git'
...@@ -430,5 +430,5 @@ Void pushNewGitopsVersion(String environment) { ...@@ -430,5 +430,5 @@ Void pushNewGitopsVersion(String environment) {
} }
Boolean hasAggregationManagerValuesFileChanged(String environment) { Boolean hasAggregationManagerValuesFileChanged(String environment) {
return sh (script: "git status | grep '${environment}/application/values/aggregation-manager-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer return sh (script: "git status | grep '${environment}/application/values/aggregation-manager-.*-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment