commit f13b776617b9764f1ae916538b4caf90517be21c
author Zack Williams <zdw@opennetworking.org> Thu Mar 22 10:35:53 2018 -0700
committer Zack Williams <zdw@opennetworking.org> Mon Mar 26 14:58:12 2018 -0700
tree 5458696f310c99f618cf32b1d752872c29f99d57
parent 2943e83c188eb05f0b6b32073372b8f5a07f7f31

[CORD-2846]
Fix minor issues discovered when running Jenkins job to build images

Change-Id: I572a7b686ce6738b44feb4f2e53c4c437d7c0c17

Jenkinsfile.imagebuilder

diff --git a/Jenkinsfile.imagebuilder b/Jenkinsfile.imagebuilder
index 48b97fa..2309605 100644
--- a/Jenkinsfile.imagebuilder
+++ b/Jenkinsfile.imagebuilder
@@ -26,7 +26,7 @@
 
 stage('imagebuilder'){
   node('master') {
-    sh '$WORKSPACE/imagebuilder.py -v -b -r cord/ -c cord/docker_images.yml -l image_logs -a ib_actions.yml -g ib_graph.dot'
+    sh '$WORKSPACE/imagebuilder.py -v -r cord/ -c cord/docker_images.yml -l image_logs -a ib_actions.yml -g ib_graph.dot'
   }
 }
 
@@ -37,8 +37,9 @@
     withDockerRegistry([credentialsId: 'docker-artifact-push-credentials']) {
       for(image in ib_actions.ib_built){
         for(tag in image.tags){
-          echo "Pushing image: " + tag
-          docker.image(tag).push()
+          push_tag = image.base + ":" + tag
+          echo "Pushing image: " + push_tag
+          docker.image(push_tag).push()
         }
       }
     }

scripts/imagebuilder.py

diff --git a/scripts/imagebuilder.py b/scripts/imagebuilder.py
old mode 100644
new mode 100755