diff --git a/Jenkinsfile b/Jenkinsfile index 2441bc005b5f24c46db889cc6ff7012345f00991..0a1d48401fd9de9b676cf8901cc8d4edcfd908b2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -101,7 +101,7 @@ tools { go 'go-1.22.0' } tagAndPushDockerImage('info-manager-proxy', IMAGE_TAG) - if (env.BRANCH_NAME == 'master') { + if (isMainBranch()) { tagAndPushDockerImage('info-manager-proxy', 'snapshot-latest') } else if (env.BRANCH_NAME == 'release') { @@ -131,7 +131,7 @@ tools { go 'go-1.22.0' } stage('Trigger Dev rollout') { when { - branch 'master' + branch 'main' } steps { script { @@ -206,8 +206,8 @@ String buildVersionName() { String getBuildProfile() { - if (isMasterBranch()) { - return "-P master" + if (isMainBranch()) { + return "-P main" } else if (isReleaseBranch()) { return "-P release" } else { @@ -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 } -Boolean isMasterBranch() { - return env.BRANCH_NAME == 'master' +Boolean isMainBranch() { + return env.BRANCH_NAME == 'main' } Boolean isReleaseBranch() { @@ -325,4 +325,5 @@ 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 +} +