From 683b527b925c7082308f2febd1a41fd6a735d9d8 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 17 Jan 2024 11:30:30 +0100
Subject: [PATCH] OZG-4786 OZG-4792 Different kind of docker image tags for
master and release branch
---
Jenkinsfile | 54 ++++++++++++-----------------------------------------
1 file changed, 12 insertions(+), 42 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c5862100..a2c1876b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -84,28 +84,7 @@ pipeline {
}
}
- // stage('Tag and Push Docker image') {
- // steps {
- // script {
- // FAILED_STAGE=env.STAGE_NAME
-
- // if (env.BRANCH_NAME == 'master') {
- // reTagAndPushDockerImage('snapshot-latest')
- // }
- // else if (env.BRANCH_NAME == 'release') {
- // reTagAndPushDockerImage('latest')
- // }
- // else {
- // pushDockerImage()
- // }
- // }
- // }
- // }
-
stage('Sonar Checks') {
- // when {
- // branch 'master'
- // }
steps {
script {
FAILED_STAGE=env.STAGE_NAME
@@ -172,32 +151,23 @@ pipeline {
}
}
+String generateImageTag() {
-
-Void reTagAndPushDockerImage(String newTag){
- withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
- sh "docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}"
-
- sh "docker tag docker.ozg-sh.de/administration:${IMAGE_TAG} docker.ozg-sh.de/administration:${newTag}"
- sh "docker push docker.ozg-sh.de/administration:${newTag}"
+ def imageTag = ""
+ if (env.BRANCH_NAME == 'master') {
+ imageTag += "snapshot-latest"
}
-}
-
-Void pushDockerImage(){
- withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) {
- sh "docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}"
-
- sh "docker push docker.ozg-sh.de/administration:${IMAGE_TAG}"
+ else if (env.BRANCH_NAME == 'release') {
+ imageTag += "latest"
}
-}
-
-String generateImageTag() {
- def imageTag = "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"
-
- if (env.BRANCH_NAME == 'master') {
- imageTag += "-${env.GIT_COMMIT.take(7)}"
+ else {
+ imageTag += "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"
}
+ // if (env.BRANCH_NAME == 'master') {
+ // imageTag += "-${env.GIT_COMMIT.take(7)}"
+ // }
+
return imageTag
}
--
GitLab