From a992dd26e841a629abb2b800ff198e18583035c3 Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Thu, 19 Dec 2024 13:54:26 +0100
Subject: [PATCH] OZG-7324 adjust JenkinsFile
---
Jenkinsfile | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 96e993f..da88c8a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -142,7 +142,7 @@ tools { go 'go-1.22.0' }
tagAndPushDockerImage('fachstellen-proxy', IMAGE_TAG)
- if (env.BRANCH_NAME == 'master') {
+ if (isMainBranch()) {
tagAndPushDockerImage('fachstellen-proxy', 'snapshot-latest')
}
else if (env.BRANCH_NAME == 'release') {
@@ -173,7 +173,7 @@ tools { go 'go-1.22.0' }
stage('Trigger Dev rollout') {
when {
- branch 'master'
+ branch 'main'
}
steps {
script {
@@ -228,8 +228,8 @@ String getHelmRepository(){
}
String getBuildProfile() {
- if (isMasterBranch()) {
- return "-P master"
+ if (isMainBranch()) {
+ return "-P main"
} else if (isReleaseBranch()) {
return "-P release"
} else {
@@ -333,8 +333,8 @@ Boolean hasFachstellenProxyValuesFileChanged(String environment) {
return sh (script: "git status | grep '${environment}/application/values/fachstellen-proxy-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
}
-Boolean isMasterBranch() {
- return env.BRANCH_NAME == 'master'
+Boolean isMainBranch() {
+ return env.BRANCH_NAME == 'main'
}
Boolean isReleaseBranch() {
@@ -364,4 +364,4 @@ Void tagAndPushDockerImage(String imageName, String newTag){
sh "docker tag docker.ozg-sh.de/${imageName}:${env.APP_VERSION} docker.ozg-sh.de/${imageName}:${newTag}"
sh "docker push docker.ozg-sh.de/${imageName}:${newTag}"
}
-}
\ No newline at end of file
+}
--
GitLab