Skip to content
Snippets Groups Projects
Commit 9c497dd5 authored by Bastian's avatar Bastian
Browse files

ozg-7324 adjust jenkinsfile

parent 35de3a77
No related branches found
No related tags found
No related merge requests found
...@@ -69,7 +69,7 @@ pipeline { ...@@ -69,7 +69,7 @@ pipeline {
when { when {
not { not {
anyOf { anyOf {
branch 'master' branch 'main'
branch 'release' branch 'release'
} }
} }
...@@ -96,7 +96,7 @@ pipeline { ...@@ -96,7 +96,7 @@ pipeline {
script { script {
try { try {
if (env.BRANCH_NAME == 'master') { if (env.BRANCH_NAME == 'main') {
withSonarQubeEnv('sonarqube-ozg-sh'){ withSonarQubeEnv('sonarqube-ozg-sh'){
sh 'mvn -s $MAVEN_SETTINGS sonar:sonar' sh 'mvn -s $MAVEN_SETTINGS sonar:sonar'
} }
...@@ -147,7 +147,7 @@ pipeline { ...@@ -147,7 +147,7 @@ pipeline {
tagAndPushDockerImage(KEYCLOAK_OPERATOR_NAME, IMAGE_TAG) tagAndPushDockerImage(KEYCLOAK_OPERATOR_NAME, IMAGE_TAG)
tagAndPushDockerImage(ELASTICSEARCH_OPERATOR_NAME, IMAGE_TAG) tagAndPushDockerImage(ELASTICSEARCH_OPERATOR_NAME, IMAGE_TAG)
if (isMasterBranch()) { if (isMainBranch()) {
tagAndPushDockerImage(KEYCLOAK_OPERATOR_NAME, 'snapshot-latest') tagAndPushDockerImage(KEYCLOAK_OPERATOR_NAME, 'snapshot-latest')
tagAndPushDockerImage(ELASTICSEARCH_OPERATOR_NAME, 'snapshot-latest') tagAndPushDockerImage(ELASTICSEARCH_OPERATOR_NAME, 'snapshot-latest')
} }
...@@ -183,7 +183,7 @@ pipeline { ...@@ -183,7 +183,7 @@ pipeline {
stage('Trigger Dev rollout') { stage('Trigger Dev rollout') {
when { when {
branch 'master' branch 'main'
} }
steps { steps {
script { script {
...@@ -252,7 +252,7 @@ String getHelmRepoUrl(){ ...@@ -252,7 +252,7 @@ String getHelmRepoUrl(){
String generateHelmChartVersion() { String generateHelmChartVersion() {
def chartVersion = getPomVersion('pom.xml') def chartVersion = getPomVersion('pom.xml')
if (isMasterBranch()) { if (isMainBranch()) {
chartVersion += "-${env.GIT_COMMIT.take(7)}" chartVersion += "-${env.GIT_COMMIT.take(7)}"
} }
else if (!isReleaseBranch()) { else if (!isReleaseBranch()) {
...@@ -262,8 +262,8 @@ String generateHelmChartVersion() { ...@@ -262,8 +262,8 @@ String generateHelmChartVersion() {
return chartVersion.replaceAll('_', '-') return chartVersion.replaceAll('_', '-')
} }
Boolean isMasterBranch() { Boolean isMainBranch() {
return env.BRANCH_NAME == 'master' return env.BRANCH_NAME == 'main'
} }
Boolean isReleaseBranch() { Boolean isReleaseBranch() {
...@@ -375,7 +375,7 @@ String getPomVersion(String pomFile){ ...@@ -375,7 +375,7 @@ String getPomVersion(String pomFile){
String generateImageTag() { String generateImageTag() {
def imageTag = "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}" def imageTag = "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"
if (env.BRANCH_NAME == 'master') { if (env.BRANCH_NAME == 'main') {
imageTag += "-${env.GIT_COMMIT.take(7)}" imageTag += "-${env.GIT_COMMIT.take(7)}"
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment