diff --git a/Jenkinsfile b/Jenkinsfile index 1afaef5750539e1b20a41cb8b7efe8aeaf8d422f..51cd03fb94ef0eaced06253d5557f7303ea2041e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -93,7 +93,7 @@ tools { go 'go-1.22.0' } tagAndPushDockerImage('info-manager-proxy', IMAGE_TAG) - if (env.BRANCH_NAME == 'dev') { + if (env.BRANCH_NAME == 'master') { tagAndPushDockerImage('info-manager-proxy', 'snapshot-latest') } else if (env.BRANCH_NAME == 'release') { @@ -184,8 +184,8 @@ String generateImageTag() { String getBuildProfile() { - if (isDevBranch()) { - return "-P dev" + if (isMasterBranch()) { + return "-P master" } else if (isReleaseBranch()) { return "-P release" } else { @@ -289,8 +289,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 isDevBranch() { - return env.BRANCH_NAME == 'dev' +Boolean isMasterBranch() { + return env.BRANCH_NAME == 'master' } Boolean isReleaseBranch() { @@ -300,7 +300,7 @@ Boolean isReleaseBranch() { String generateHelmChartVersion() { def chartVersion = "${env.APP_VERSION}" - if (isDevBranch()) { + if (isMasterBranch()) { chartVersion += "-${env.GIT_COMMIT.take(7)}" } else if (!isReleaseBranch()) {