From: beierlm <mark.beierl@canonical.com>
Date: Tue, 13 Apr 2021 16:18:37 +0000 (-0400)
Subject: Bug 1501 - Correct tag for push
X-Git-Tag: branch-sol006v331-start~13
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F25%2F10625%2F2;p=osm%2Fdevops.git

Bug 1501 - Correct tag for push

Change to use the tag of the current build to promote to the
final dockertag that is pushed to Dockerhub

Fixes bug 1501

Change-Id: I13b83afd9dad013cd51b646a6a14399c8c62cd3c
Signed-off-by: beierlm <mark.beierl@canonical.com>
---

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index 63683817..954c692d 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -557,11 +557,13 @@ EOF"""
                             for (buildStep in containerList) {
                                 def module = buildStep
                                 def moduleName = buildStep.toLowerCase()
-                                def moduleTag = params.DOCKER_TAG
+                                def dockerTag = params.DOCKER_TAG
+                                def moduleTag = container_name
+
                                 parallelSteps[module] = {
                                     dir("$module") {
-                                        sh "docker tag opensourcemano/${moduleName}:${moduleTag} opensourcemano/${moduleName}:${moduleTag}"
-                                        sh "docker push opensourcemano/${moduleName}:${moduleTag}"
+                                        sh "docker tag opensourcemano/${moduleName}:${moduleTag} opensourcemano/${moduleName}:${dockerTag}"
+                                        sh "docker push opensourcemano/${moduleName}:${dockerTag}"
                                     }
                                 }
                             }