From 1ea7d6957d6e9eff1c28ab5a49ceca6bd50cb5b9 Mon Sep 17 00:00:00 2001 From: selias Date: Fri, 17 Feb 2017 12:00:12 +0100 Subject: HC Test: reorder commands in HC package download script Change-Id: I5e1ca7619704758f44b51154be62e40dd27e3117 Signed-off-by: selias --- resources/tools/download_hc_build_pkgs.sh | 3 ++- resources/tools/download_hc_pkgs.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/tools/download_hc_build_pkgs.sh b/resources/tools/download_hc_build_pkgs.sh index 312d9f3353..c83badaead 100755 --- a/resources/tools/download_hc_build_pkgs.sh +++ b/resources/tools/download_hc_build_pkgs.sh @@ -23,7 +23,6 @@ OS=$2 # Download the latest VPP and VPP plugin .deb packages URL="https://nexus.fd.io/service/local/artifact/maven/content" VER="LATEST" -REPO="fd.io.${STREAM}.${OS}" VPP_GROUP="io.fd.vpp" NSH_GROUP="io.fd.nsh_sfc" VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dev vpp-dpdk-dkms vpp-lib vpp-plugins vpp-api-java" @@ -43,6 +42,8 @@ elif [ "${OS}" == "centos7" ]; then CLASS="rpm" fi +REPO="fd.io.${STREAM}.${OS}" + for ART in ${VPP_ARTIFACTS}; do for PAC in $PACKAGE; do curl "${URL}?r=${REPO}&g=${VPP_GROUP}&a=${ART}&p=${PAC}&v=${VER}&c=${CLASS}" -O -J || exit diff --git a/resources/tools/download_hc_pkgs.sh b/resources/tools/download_hc_pkgs.sh index b958dc97d9..79cccb971a 100755 --- a/resources/tools/download_hc_pkgs.sh +++ b/resources/tools/download_hc_pkgs.sh @@ -22,7 +22,6 @@ OS=$2 URL="https://nexus.fd.io/service/local/artifact/maven/content" VER="RELEASE" -REPO="fd.io.${STREAM}.${OS}" GROUP="io.fd.vpp" HC_GROUP="io.fd.hc2vpp" NSH_GROUP="io.fd.nsh_sfc" @@ -44,6 +43,8 @@ elif [ "${OS}" == "centos7" ]; then CLASS="rpm" fi +REPO="fd.io.${STREAM}.${OS}" + for ART in ${VPP_ARTIFACTS}; do for PAC in $PACKAGE; do curl "${URL}?r=${REPO}&g=${GROUP}&a=${ART}&p=${PAC}&v=${VER}&c=${CLASS}" -O -J || exit -- cgit 1.2.3-korg