From 68e6689d58bc453b6225602d26bbd4675f90dc4d Mon Sep 17 00:00:00 2001
From: zhenzhen <zhenzhen.liu@mgm-tp.com>
Date: Fri, 15 Nov 2024 20:21:29 +0100
Subject: [PATCH] update jenkinsfile
---
Jenkinsfile | 29 +++++++----------------------
1 file changed, 7 insertions(+), 22 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index ecaa19d..3c2783c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -97,7 +97,7 @@ pipeline {
steps {
script {
FAILED_STAGE=env.STAGE_NAME
- IMAGE_TAG = generateImageTag()
+ IMAGE_TAG = buildVersionName()
tagAndPushDockerImage(IMAGE_TAG)
@@ -116,7 +116,7 @@ pipeline {
steps {
script {
FAILED_STAGE=env.STAGE_NAME
- HELM_CHART_VERSION = generateHelmChartVersion()
+ HELM_CHART_VERSION = buildVersionName()
sh "./run_helm_test.sh"
@@ -167,7 +167,7 @@ pipeline {
stage ('Deploy SBOM to DependencyTrack') {
steps {
script {
- IMAGE_TAG = "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"
+ IMAGE_TAG = buildVersionName('pom.xml')
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
withCredentials([string(credentialsId: 'dependency-track-api-key', variable: 'API_KEY')]) {
@@ -276,17 +276,12 @@ Void loginToDockerRepo() {
}
-String generateHelmChartVersion() {
- def chartVersion = getPomVersion('pom.xml')
- if (env.BRANCH_NAME == 'master') {
- chartVersion += "-${env.GIT_COMMIT.take(7)}"
- }
- else if (env.BRANCH_NAME != 'release') {
- chartVersion += "-${env.BRANCH_NAME}"
+String buildVersionName(String pomFile) {
+ if (isReleaseBranch()) {
+ return getPomVersion(pomFile)
}
-
- return chartVersion.replaceAll("_", "-")
+ return "${getPomVersion(pomFile)}-${env.BRANCH_NAME}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-")
}
Void tagAndPushDockerImage(String newTag){
@@ -298,16 +293,6 @@ Void tagAndPushDockerImage(String newTag){
}
}
-String generateImageTag() {
- def imageTag = "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"
-
- if (env.BRANCH_NAME == 'master') {
- imageTag += "-${env.GIT_COMMIT.take(7)}"
- }
-
- return imageTag
-}
-
Void configureGit() {
final email = "jenkins@ozg-sh.de"
final name = "jenkins"
--
GitLab