From 9b24c50f8de364fac17c9fe25a65bf39645d662a Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Tue, 11 Mar 2025 13:47:59 +0100
Subject: [PATCH] adjust JenkinsFile#buildImageTag
---
Jenkinsfile | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index edbc090..7f2ad69 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -373,15 +373,29 @@ String getPomVersion(String pomFile){
}
String generateImageTag() {
- def imageTag = "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"
+ if (isReleaseBranch()) {
+ return getPomVersion()
+ }
+
+ return "${getPomVersion()}-${validateBranchName(env.BRANCH_NAME)}${getCommitHash()}".replaceAll("_", "-")
+}
- if (env.BRANCH_NAME == 'main') {
- imageTag += "-${env.GIT_COMMIT.take(7)}"
+String validateBranchName(branchName) {
+ int maxLength = 20
+ if (branchName.length() > maxLength) {
+ String originalBranchName = branchName
+ branchName = branchName.substring(0, maxLength)
+ echo "WARNING: Branch name '${originalBranchName}' exceeded ${maxLength} characters. " +
+ "It has been truncated to '${branchName}' for deployment purposes."
}
+ return branchName
+}
- return imageTag
+String getCommitHash() {
+ return "-${env.GIT_COMMIT.take(7)}";
}
+
String getParentPomVersion(String filePath) {
def pom = readMavenPom file: filePath
return pom.parent.version
--
GitLab