From 6ed3fe7b78569a5f03422f4dca363f47a4a8c7b6 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 15 Jan 2024 17:05:15 +0100
Subject: [PATCH] OZG-4786 OZG-4792 Revived generateImageTag
---
Jenkinsfile | 8 +++++---
pom.xml | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 55e2abfa..49bc38cf 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,6 +9,7 @@ pipeline {
BLUE_OCEAN_URL = "https://jenkins.infra.ozg-cloud.systems/job/administration/job/${env.BRANCH_NAME}/${env.BUILD_NUMBER}/"
RELEASE_REGEX = /\d+.\d+.\d+/
SNAPSHOT_REGEX = /\d+.\d+.\d+-SNAPSHOT/
+ VERSION = getPomVersion('pom.xml')
FAILED_STAGE = ""
SH_SUCCESS_STATUS_CODE = 0
}
@@ -73,9 +74,10 @@ pipeline {
script {
FAILED_STAGE=env.STAGE_NAME
}
+ IMAGE_TAG = generateImageTag()
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
- sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 -Dgit-version=${env.BRANCH_NAME} -Dversion=${PROJECTREVISION}'
+ sh 'mvn -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 -Dtag=$IMAGE_TAG'
}
}
}
@@ -84,9 +86,9 @@ pipeline {
steps {
script {
FAILED_STAGE=env.STAGE_NAME
- // IMAGE_TAG = generateImageTag()
+ IMAGE_TAG = generateImageTag()
- tagAndPushDockerImage("${env.BRANCH_NAME}-${PROJECTREVISION}")
+ tagAndPushDockerImage($IMAGE_TAG)
if (env.BRANCH_NAME == 'master') {
tagAndPushDockerImage('snapshot-latest')
diff --git a/pom.xml b/pom.xml
index 284b96cd..1a7c0938 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<image>
- <name>docker.ozg-sh.de/administration:${git-branch}-${version}</name>
+ <name>docker.ozg-sh.de/administration:${tag}</name>
</image>
<excludes>
<exclude>
--
GitLab