From 44d3d012155f42e2e0a2301cc7cfb1b6f68ca452 Mon Sep 17 00:00:00 2001 From: beierlm Date: Tue, 13 Apr 2021 12:18:37 -0400 Subject: [PATCH] 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 --- jenkins/ci-pipelines/ci_stage_3.groovy | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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}" } } } -- 2.25.1