diff --git a/Jenkinsfile b/Jenkinsfile index bd967d062615664ee895d70e507bf4878dba138e..c0713c0b6aec39b2c486a52ef906c53acffd4add 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,7 +67,7 @@ pipeline { when { not { anyOf { - branch 'master' + branch 'main' branch 'release' } } @@ -94,7 +94,7 @@ pipeline { sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS -P ci-build clean install -Dmaven.wagon.http.retryHandler.count=3' script { - if (env.BRANCH_NAME == 'master') { + if (isMainBranch()) { withSonarQubeEnv('sonarqube-ozg-sh'){ sh 'mvn -s $MAVEN_SETTINGS sonar:sonar' } @@ -143,7 +143,7 @@ pipeline { // stage('Deploy FormCycle Plugin to FC-server') { // when { // anyOf { -// branch 'master' +// branch 'main' // } // } // @@ -225,4 +225,8 @@ String getPomVersion(String pomFile){ def pom = readMavenPom file: pomFile return pom.version +} + +Boolean isMainBranch() { + return env.BRANCH_NAME == 'main' } \ No newline at end of file