From 9c497dd52df5a85047905c56f51e65c146204411 Mon Sep 17 00:00:00 2001
From: Bastian <bastian.heppener@mgm-tp.com>
Date: Wed, 5 Feb 2025 16:57:24 +0100
Subject: [PATCH] ozg-7324 adjust jenkinsfile
---
Jenkinsfile | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 178d7c9..edbc090 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -69,7 +69,7 @@ pipeline {
when {
not {
anyOf {
- branch 'master'
+ branch 'main'
branch 'release'
}
}
@@ -96,7 +96,7 @@ pipeline {
script {
try {
- if (env.BRANCH_NAME == 'master') {
+ if (env.BRANCH_NAME == 'main') {
withSonarQubeEnv('sonarqube-ozg-sh'){
sh 'mvn -s $MAVEN_SETTINGS sonar:sonar'
}
@@ -147,7 +147,7 @@ pipeline {
tagAndPushDockerImage(KEYCLOAK_OPERATOR_NAME, IMAGE_TAG)
tagAndPushDockerImage(ELASTICSEARCH_OPERATOR_NAME, IMAGE_TAG)
- if (isMasterBranch()) {
+ if (isMainBranch()) {
tagAndPushDockerImage(KEYCLOAK_OPERATOR_NAME, 'snapshot-latest')
tagAndPushDockerImage(ELASTICSEARCH_OPERATOR_NAME, 'snapshot-latest')
}
@@ -183,7 +183,7 @@ pipeline {
stage('Trigger Dev rollout') {
when {
- branch 'master'
+ branch 'main'
}
steps {
script {
@@ -252,7 +252,7 @@ String getHelmRepoUrl(){
String generateHelmChartVersion() {
def chartVersion = getPomVersion('pom.xml')
- if (isMasterBranch()) {
+ if (isMainBranch()) {
chartVersion += "-${env.GIT_COMMIT.take(7)}"
}
else if (!isReleaseBranch()) {
@@ -262,8 +262,8 @@ String generateHelmChartVersion() {
return chartVersion.replaceAll('_', '-')
}
-Boolean isMasterBranch() {
- return env.BRANCH_NAME == 'master'
+Boolean isMainBranch() {
+ return env.BRANCH_NAME == 'main'
}
Boolean isReleaseBranch() {
@@ -375,7 +375,7 @@ String getPomVersion(String pomFile){
String generateImageTag() {
def imageTag = "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"
- if (env.BRANCH_NAME == 'master') {
+ if (env.BRANCH_NAME == 'main') {
imageTag += "-${env.GIT_COMMIT.take(7)}"
}
--
GitLab