Skip to content
Snippets Groups Projects
Commit 683b527b authored by OZGCloud's avatar OZGCloud
Browse files

OZG-4786 OZG-4792 Different kind of docker image tags for master and release branch

parent 9d62a6aa
No related branches found
No related tags found
No related merge requests found
......@@ -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,31 +151,22 @@ 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"
}
else {
imageTag += "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"
}
String generateImageTag() {
def imageTag = "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"
if (env.BRANCH_NAME == 'master') {
imageTag += "-${env.GIT_COMMIT.take(7)}"
}
// if (env.BRANCH_NAME == 'master') {
// imageTag += "-${env.GIT_COMMIT.take(7)}"
// }
return imageTag
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment