From: Mark Beierl <mark.beierl@canonical.com>
Date: Thu, 3 Mar 2022 14:20:19 +0000 (-0500)
Subject: Fix Docker Push
X-Git-Tag: v12.0.0rc1~32
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F17%2F11717%2F1;p=osm%2Fdevops.git

Fix Docker Push

The variables for module, moduleName, etc are not being created in local
scope, causing the final docker push to re-use the last set value for
the modules.

Change-Id: I635955e5edcc2d94a50cec7749ac87813b5ac6c7
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
---

diff --git a/jenkins/ci-pipelines/ci_stage_3.groovy b/jenkins/ci-pipelines/ci_stage_3.groovy
index e8e6d25d..61e9fd8f 100644
--- a/jenkins/ci-pipelines/ci_stage_3.groovy
+++ b/jenkins/ci-pipelines/ci_stage_3.groovy
@@ -605,10 +605,10 @@ EOF"""
                         stage('Publish to Dockerhub') {
                             parallelSteps = [:]
                             for (buildStep in containerList) {
-                                module = buildStep
-                                moduleName = buildStep.toLowerCase()
-                                dockerTag = params.DOCKER_TAG
-                                moduleTag = containerName
+                                def module = buildStep
+                                def moduleName = buildStep.toLowerCase()
+                                def dockerTag = params.DOCKER_TAG
+                                def moduleTag = containerName
 
                                 parallelSteps[module] = {
                                     dir("$module") {