From 20ab96bce4120f7c2a433c0dd6f3e1ea8e8d36b2 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Fri, 20 Sep 2024 07:17:52 +0200
Subject: [PATCH] OZG-6777 Anpassung Jenkinsfile an Branchumstellung
---
Jenkinsfile | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index db4cd8f..6942d38 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -49,7 +49,7 @@ pipeline {
when {
not {
anyOf {
- branch 'dev'
+ branch 'master'
branch 'release'
}
}
@@ -82,7 +82,7 @@ pipeline {
}
stage('Sonar Checks') {
when {
- branch 'dev'
+ branch 'master'
}
steps {
script {
@@ -138,7 +138,7 @@ pipeline {
tagAndPushDockerImage(IMAGE_TAG)
- if (env.BRANCH_NAME == 'dev') {
+ if (env.BRANCH_NAME == 'master') {
tagAndPushDockerImage('snapshot-latest')
}
@@ -170,7 +170,7 @@ pipeline {
stage('Trigger Dev rollout') {
when {
- branch 'dev'
+ branch 'master'
}
steps {
script {
@@ -227,7 +227,7 @@ pipeline {
}
failure {
script {
- if (env.BRANCH_NAME == 'dev' || env.BRANCH_NAME == 'release') {
+ if (env.BRANCH_NAME == 'master' || env.BRANCH_NAME == 'release') {
sendFailureMessage()
}
}
@@ -262,7 +262,7 @@ Void loginToDockerRepo() {
String generateHelmChartVersion() {
def chartVersion = getPomVersion('pom.xml')
- if (env.BRANCH_NAME == 'dev') {
+ if (env.BRANCH_NAME == 'master') {
chartVersion += "-${env.GIT_COMMIT.take(7)}"
}
else if (env.BRANCH_NAME != 'release') {
@@ -290,7 +290,7 @@ String getPomVersion(String pomFile){
String generateImageTag() {
def imageTag = "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"
- if (env.BRANCH_NAME == 'dev') {
+ if (env.BRANCH_NAME == 'master') {
imageTag += "-${env.GIT_COMMIT.take(7)}"
}
@@ -370,7 +370,7 @@ Void sendFailureMessage() {
"format": "org.matrix.custom.html", \
"formatted_body":"InfoManager: Build Failed. Stage: ${FAILED_STAGE} Build-ID: <a href='${BLUE_OCEAN_URL}'>${env.BUILD_NUMBER}</a>"}"""
- if (env.BRANCH_NAME == 'dev') {
+ if (env.BRANCH_NAME == 'master') {
room = "!iQPAvQIiRwRpNOszjw:matrix.ozg-sh.de"
}
else if (env.BRANCH_NAME == 'release') {
--
GitLab