Skip to content
Snippets Groups Projects
Commit 9e2fede0 authored by Martin's avatar Martin
Browse files

OZG-7324 adjust JenkinsFile

parent ea8b73a2
No related branches found
No related tags found
Loading
...@@ -101,7 +101,7 @@ tools { go 'go-1.22.0' } ...@@ -101,7 +101,7 @@ tools { go 'go-1.22.0' }
tagAndPushDockerImage('info-manager-proxy', IMAGE_TAG) tagAndPushDockerImage('info-manager-proxy', IMAGE_TAG)
if (env.BRANCH_NAME == 'master') { if (isMainBranch()) {
tagAndPushDockerImage('info-manager-proxy', 'snapshot-latest') tagAndPushDockerImage('info-manager-proxy', 'snapshot-latest')
} }
else if (env.BRANCH_NAME == 'release') { else if (env.BRANCH_NAME == 'release') {
...@@ -131,7 +131,7 @@ tools { go 'go-1.22.0' } ...@@ -131,7 +131,7 @@ tools { go 'go-1.22.0' }
stage('Trigger Dev rollout') { stage('Trigger Dev rollout') {
when { when {
branch 'master' branch 'main'
} }
steps { steps {
script { script {
...@@ -206,8 +206,8 @@ String buildVersionName() { ...@@ -206,8 +206,8 @@ String buildVersionName() {
String getBuildProfile() { String getBuildProfile() {
if (isMasterBranch()) { if (isMainBranch()) {
return "-P master" return "-P main"
} else if (isReleaseBranch()) { } else if (isReleaseBranch()) {
return "-P release" return "-P release"
} else { } else {
...@@ -311,8 +311,8 @@ Boolean hasInfoManagerProxyValuesFileChanged(String environment) { ...@@ -311,8 +311,8 @@ Boolean hasInfoManagerProxyValuesFileChanged(String environment) {
return sh (script: "git status | grep '${environment}/application/values/info-manager-proxy-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer return sh (script: "git status | grep '${environment}/application/values/info-manager-proxy-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
} }
Boolean isMasterBranch() { Boolean isMainBranch() {
return env.BRANCH_NAME == 'master' return env.BRANCH_NAME == 'main'
} }
Boolean isReleaseBranch() { Boolean isReleaseBranch() {
...@@ -326,3 +326,4 @@ Void tagAndPushDockerImage(String imageName, String newTag){ ...@@ -326,3 +326,4 @@ Void tagAndPushDockerImage(String imageName, String newTag){
sh "docker push docker.ozg-sh.de/${imageName}:${newTag}" sh "docker push docker.ozg-sh.de/${imageName}:${newTag}"
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment