diff --git a/Jenkinsfile b/Jenkinsfile index ee1b86a8be67422c1bfcba51fc73a7d56d86944d..e43ba8c76af10922d1187684d5918787d207b504 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,7 +44,7 @@ pipeline { when { not { anyOf { - branch 'master' + branch 'main' branch 'release' } } @@ -87,7 +87,7 @@ pipeline { stage('Sonar Checks') { when { - branch 'master' + branch 'main' } steps { script { @@ -158,7 +158,7 @@ pipeline { stage('Trigger Dev rollout') { when { - branch 'master' + branch 'main' } steps { script { @@ -197,7 +197,7 @@ pipeline { } failure { script { - if (isMasterBranch() || isReleaseBranch()) { + if (isMainBranch() || isReleaseBranch()) { sendFailureMessage() } } @@ -249,7 +249,7 @@ String getPomVersion() { } String getBuildProfile() { - if (isMasterBranch()) { + if (isMainBranch()) { return "-P dev" } else if (isReleaseBranch()) { return "-P release" @@ -354,8 +354,8 @@ Boolean hasAdministrationValuesFileChanged(String environment) { return sh (script: "git status | grep '${environment}/application/values/administration-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() {