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

OZG-7324 adjust JenkinsFile

parent 15b83a48
Branches
Tags
No related merge requests found
...@@ -44,7 +44,7 @@ pipeline { ...@@ -44,7 +44,7 @@ pipeline {
when { when {
not { not {
anyOf { anyOf {
branch 'master' branch 'main'
branch 'release' branch 'release'
} }
} }
...@@ -87,7 +87,7 @@ pipeline { ...@@ -87,7 +87,7 @@ pipeline {
stage('Sonar Checks') { stage('Sonar Checks') {
when { when {
branch 'master' branch 'main'
} }
steps { steps {
script { script {
...@@ -158,7 +158,7 @@ pipeline { ...@@ -158,7 +158,7 @@ pipeline {
stage('Trigger Dev rollout') { stage('Trigger Dev rollout') {
when { when {
branch 'master' branch 'main'
} }
steps { steps {
script { script {
...@@ -197,7 +197,7 @@ pipeline { ...@@ -197,7 +197,7 @@ pipeline {
} }
failure { failure {
script { script {
if (isMasterBranch() || isReleaseBranch()) { if (isMainBranch() || isReleaseBranch()) {
sendFailureMessage() sendFailureMessage()
} }
} }
...@@ -249,7 +249,7 @@ String getPomVersion() { ...@@ -249,7 +249,7 @@ String getPomVersion() {
} }
String getBuildProfile() { String getBuildProfile() {
if (isMasterBranch()) { if (isMainBranch()) {
return "-P dev" return "-P dev"
} else if (isReleaseBranch()) { } else if (isReleaseBranch()) {
return "-P release" return "-P release"
...@@ -354,8 +354,8 @@ Boolean hasAdministrationValuesFileChanged(String environment) { ...@@ -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 return sh (script: "git status | grep '${environment}/application/values/administration-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() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment