diff --git a/Jenkinsfile b/Jenkinsfile index 63bb9ea36c933680c0bf9bdb27b2c532d382ce96..6ea5a1b391001c078f77b15b1d459b812c742db0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -110,7 +110,7 @@ tools { go 'go-1.22.0' } tagAndPushDockerImage('fachstellen-proxy', IMAGE_TAG) - if (env.BRANCH_NAME == 'dev') { + if (env.BRANCH_NAME == 'master') { tagAndPushDockerImage('fachstellen-proxy', 'snapshot-latest') } else if (env.BRANCH_NAME == 'release') { @@ -141,7 +141,7 @@ tools { go 'go-1.22.0' } stage('Trigger Dev rollout') { when { - branch 'dev' + branch 'master' } steps { script { @@ -202,8 +202,8 @@ String generateImageTag() { String getBuildProfile() { - if (isDevBranch()) { - return "-P dev" + if (isMasterBranch()) { + return "-P master" } else if (isReleaseBranch()) { return "-P release" } else { @@ -307,8 +307,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 isDevBranch() { - return env.BRANCH_NAME == 'dev' +Boolean isMasterBranch() { + return env.BRANCH_NAME == 'master' } Boolean isReleaseBranch() { @@ -318,7 +318,7 @@ Boolean isReleaseBranch() { String generateHelmChartVersion() { def chartVersion = "${env.APP_VERSION}" - if (isDevBranch()) { + if (isMasterBranch()) { chartVersion += "-${env.GIT_COMMIT.take(7)}" } else if (!isReleaseBranch()) {