commit f88fa092195a548eb87462c55e291e09384ca226
author Andy Bavier <andy@opennetworking.org> Mon Jul 01 14:51:49 2019 -0700
committer Andy Bavier <andy@opennetworking.org> Mon Jul 01 14:51:49 2019 -0700
tree be73e1a5d0103cf1c0c282c62bbf8f11a2e6e0b8
parent 64d4e902f76b1335807dc5049866361dc20c4e9e

Fix variable reference

Change-Id: Ic013d751bf1bfef34faaaa013a7a7a7acb65f098

jjb/pipeline/voltha-publish.groovy

diff --git a/jjb/pipeline/voltha-publish.groovy b/jjb/pipeline/voltha-publish.groovy
index b5af555..b7c8b26 100644
--- a/jjb/pipeline/voltha-publish.groovy
+++ b/jjb/pipeline/voltha-publish.groovy
@@ -17,7 +17,7 @@
             manifestGroup: 'voltha', \
             currentBranch: true, \
             destinationDir: 'cord', \
-            forceSync: true,
+            forceSync: true, \
             resetFirst: true, \
             quiet: true, \
             jobs: 4, \
@@ -30,16 +30,15 @@
       steps {
         sh """
           #!/usr/bin/env bash
-          set -x
 
           pushd cord/incubator/voltha
           if [ "${params.manifestBranch}" == "master" ]
           then
-            tag="latest"
+            TAG="latest"
           else
-            tag="${params.manifestBranch}"
+            TAG="${params.manifestBranch}"
           fi
-          VOLTHA_BUILD=docker DOCKER_CACHE_ARG=--no-cache TAG=${tag} make build
+          VOLTHA_BUILD=docker DOCKER_CACHE_ARG=--no-cache TAG=\$TAG make build
           popd
           """
       }
@@ -50,21 +49,20 @@
         withDockerRegistry([credentialsId: 'docker-artifact-push-credentials', url: '']) {
           sh """
             #!/usr/bin/env bash
-            set -x
 
             pushd cord/incubator/voltha
             if [ "${params.manifestBranch}" == "master" ]
             then
-              tag="latest"
+              TAG="latest"
             else
-              tag="${params.manifestBranch}"
+              TAG="${params.manifestBranch}"
             fi
 
             if [ "${params.releaseTag}" != "" ]
             then
-              VOLTHA_BUILD=docker TAG=${tag} TARGET_REPOSITORY=voltha/ TARGET_TAG=${params.releaseTag} make push
+              VOLTHA_BUILD=docker TAG=\$TAG TARGET_REPOSITORY=voltha/ TARGET_TAG=${params.releaseTag} make push
             else
-              VOLTHA_BUILD=docker TAG=${tag} TARGET_REPOSITORY=voltha/ TARGET_TAG=${tag} make push
+              VOLTHA_BUILD=docker TAG=\$TAG TARGET_REPOSITORY=voltha/ TARGET_TAG=\$TAG make push
             fi
             popd
             """