From: Laura Sofia Enriquez <lsofia.enriquez@gmail.com>
Date: Fri, 22 Dec 2017 02:47:11 +0000 (-0300)
Subject: Remove builds from upload.sh
X-Git-Tag: opnfv-6.0.0~31^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=34cf47daa945fa53cc590c3226418a56339bc134;p=container4nfv.git

Remove builds from upload.sh

1. build.sh generates the tar ball of the vnf images.
2. upload.sh send them to artifacts.

Change-Id: If7c6de57d7f8b96696d64f39d0444412d0444a2d
Signed-off-by: Laura Sofia Enriquez <lsofia.enriquez@gmail.com>
---

diff --git a/ci/build.sh b/ci/build.sh
index 780d646..31d76e7 100755
--- a/ci/build.sh
+++ b/ci/build.sh
@@ -33,3 +33,12 @@ for i in base astaire cassandra chronos bono ellis homer homestead homestead-pro
 do
     docker save --output clearwater-$i.tar clearwater/$i
 done
+
+# Build vnf images
+docker build -t container4nfv/ping ../src/vnf/ping/.
+docker build -t container4nfv/virtio-user-ping ../src/vnf/virtio-user-ping/.
+
+# Generate tar ball
+docker save --output container4nfv-ping.tar container4nfv/ping
+docker save --output container4nfv-virtio-user-ping.tar container4nfv/virtio-user-ping
+
diff --git a/ci/upload.sh b/ci/upload.sh
index 9670d45..fedff0b 100755
--- a/ci/upload.sh
+++ b/ci/upload.sh
@@ -16,14 +16,6 @@
 #
 set -ex
 
-# Build the images
-docker build -t container4nfv/ping ../src/vnf/ping/.
-docker build -t container4nfv/virtio-user-ping ../src/vnf/virtio-user-ping/.
-
-# Save the images
-docker save --output container4nfv-ping.tar container4nfv/ping
-docker save --output container4nfv-virtio-user-ping.tar container4nfv/virtio-user-ping
-
 # Upload both .tar to artifacts
 gsutil cp container4nfv-ping.tar gs://$GS_URL/container4nfv-ping.tar
 gsutil cp container4nfv-virtio-user-ping.tar gs://$GS_URL/container4nfv-virtio-user-ping.tar