OZG-4786 OZG-4792 Docker image is pushed

Jenkinsfile

@@ -11,6 +11,7 @@ pipeline {
         SNAPSHOT_REGEX = /\d+.\d+.\d+-SNAPSHOT/
         FAILED_STAGE = ""
         SH_SUCCESS_STATUS_CODE = 0
+        IMAGE_TAG = generateImageTag()
     }
 
     options {
@@ -72,7 +73,6 @@ pipeline {
           steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
-                    IMAGE_TAG = generateImageTag()
                 }
 
                 configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
@@ -86,14 +86,14 @@ pipeline {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
                     
-
-                    tagAndPushDockerImage(IMAGE_TAG)
-
                     if (env.BRANCH_NAME == 'master') {
-                        tagAndPushDockerImage('snapshot-latest')
+                        reTagAndPushDockerImage('snapshot-latest')
                     }
                     else if (env.BRANCH_NAME == 'release') {
-                        tagAndPushDockerImage('latest')
+                        reTagAndPushDockerImage('latest')
+                    }
+                    else {
+                        pushDockerImage()
                     }
                 }
             }
@@ -171,15 +171,23 @@ pipeline {
 
 
 
-Void tagAndPushDockerImage(String newTag){
+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:build-latest docker.ozg-sh.de/administration:${newTag}"
+        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}"
     }
 }
 
+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}"
+    }
+}
+
 String generateImageTag() {
     def imageTag = "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"