diff options
| author |   Xuan Jia <jason.jiaxuan@gmail.com> | 2018-01-12 12:32:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-12 12:32:11 +0000 |
| commit | 80cd7ba641a5eded065c078ac8bdede40f72bcb8 (patch) | |
| tree | 815b479c7f41ef6da2a9a04bb52942772b17f4af | |
| parent | dd5f225f912bb2630e81539c59d2a1358cf48da0 (diff) | |
| parent | 34cf47daa945fa53cc590c3226418a56339bc134 (diff) | |
Merge "Remove builds from upload.sh"
| -rwxr-xr-x | ci/build.sh | 9 | ||||
| -rwxr-xr-x | ci/upload.sh | 8 |
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 |