summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorLaura Sofia Enriquez <lsofia.enriquez@gmail.com>2017-12-21 23:47:11 -0300
committerLaura Sofia Enriquez <lsofia.enriquez@gmail.com>2018-01-03 13:35:33 -0300
commit34cf47daa945fa53cc590c3226418a56339bc134 (patch)
treefa546adaca65ffc80fc33b3fde46bd41d4767b9d /ci
parentf5ff44072d4ff3c9e21e38ce0070949e313b56ce (diff)
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>
Diffstat (limited to 'ci')
-rwxr-xr-xci/build.sh9
-rwxr-xr-xci/upload.sh8
2 files changed, 9 insertions, 8 deletions
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