OZG-5907 update jenkinsfile

Jenkinsfile

@@ -106,7 +106,7 @@ pipeline {
           }
         }
 
-        stage('Server') {
+        stage('Build Server artefacts, build and push docker image') {
             steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
@@ -155,13 +155,16 @@ pipeline {
             }
         }
         stage('Tag and Push Docker Image') {
+            when {
+                anyOf {
+                    branch 'master'
+                    branch 'release'
+                }
+            }
          
             steps {
                 script {
                     FAILED_STAGE = env.STAGE_NAME
-                    IMAGE_TAG = generateImageTag()
-
-                    tagAndPushDockerImage(IMAGE_TAG)
 
                     if (isMasterBranch()) {
                         tagAndPushDockerImage('snapshot-latest')