X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Ftools%2Fdownload_install_vpp_pkgs.sh;h=67c8362b7e7e8cbbc6b42febaa8c27dce0572a0f;hb=1fcfc9bcc91c9bf9f1ab10fab898efc0d8c1e25f;hp=0d95e7592210d2e22e7c1ffe4a07fa706e9003f0;hpb=04d4f8210c7ae2e6a7b51abd060b8f734eecd05a;p=csit.git

diff --git a/resources/tools/download_install_vpp_pkgs.sh b/resources/tools/download_install_vpp_pkgs.sh
index 0d95e75922..67c8362b7e 100755
--- a/resources/tools/download_install_vpp_pkgs.sh
+++ b/resources/tools/download_install_vpp_pkgs.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright (c) 2016 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,18 +13,31 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-set -x
+set -ex
+
+trap 'rm -f *.deb.md5; exit' EXIT
+trap 'rm -f *.deb.md5;rm -f *.deb; exit' ERR
 
 URL="https://nexus.fd.io/service/local/artifact/maven/content"
 VER="RELEASE"
-REPO="fd.io.dev"
+
+VPP_REPO_URL_PATH="./VPP_REPO_URL"
+if [ -e "$VPP_REPO_URL_PATH" ]; then
+    VPP_REPO_URL=$(cat $VPP_REPO_URL_PATH)
+    REPO=$(echo ${VPP_REPO_URL#https://nexus.fd.io/content/repositories/})
+    REPO=$(echo ${REPO%/io/fd/vpp/})
+else
+    REPO='fd.io.master.ubuntu.xenial.main'
+fi
+
 GROUP="io.fd.vpp"
-ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dev vpp-dpdk-dkms vpp-lib"
+ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dev vpp-dpdk-dkms vpp-lib vpp-plugins"
 PACKAGE="deb deb.md5"
+CLASS="deb"
 
 for ART in ${ARTIFACTS}; do
     for PAC in $PACKAGE; do
-        curl "${URL}?r=${REPO}&g=${GROUP}&a=${ART}&p=${PAC}&v=${VER}" -O -J || exit
+        curl "${URL}?r=${REPO}&g=${GROUP}&a=${ART}&p=${PAC}&v=${VER}&c=${CLASS}" -O -J || exit
     done
 done
 
@@ -36,5 +49,9 @@ for MD5FILE in *.md5; do
     md5sum -c ${MD5FILE} || exit
 done
 
-echo sudo dpkg -i *.deb
-
+if [ "$1" != "--skip-install" ]; then
+    echo Installing VPP
+    sudo dpkg -i *.deb
+else
+    echo VPP Installation skipped
+fi