From 71e678d575246f551e55fdba07291ac3b8c9ca1b Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 17 Oct 2024 13:48:54 +0200
Subject: [PATCH] resolve merge conflicts
---
Jenkinsfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a97f069..83763b6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -282,7 +282,7 @@ Void setNewTestVersion() {
Void setNewGitopsVersion(String environment) {
dir("gitops") {
- def envFile = "${environment}/application/values/antragsraum-client-values.yaml"
+ def envFile = "${environment}/application/values/antragraum-client-values.yaml"
def envVersions = readYaml file: envFile
@@ -293,7 +293,7 @@ Void setNewGitopsVersion(String environment) {
if (hasValuesFileChanged(environment)) {
sh "git add ${envFile}"
- sh "git commit -m 'jenkins rollout ${environment} antragsraum-client version ${IMAGE_TAG}'"
+ sh "git commit -m 'jenkins rollout ${environment} antragraum-client version ${IMAGE_TAG}'"
}
}
}
@@ -306,7 +306,7 @@ String getPackagejsonVersion() {
}
Boolean hasValuesFileChanged(String environment) {
- return sh (script: "git status | grep '${environment}/application/values/antragsraum-client-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
+ return sh (script: "git status | grep '${environment}/application/values/antragraum-client-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
}
Boolean isReleaseBranch() {
--
GitLab