HC Test: reorder commands in HC package download script 09/5409/1
authorselias <samelias@cisco.com>
Fri, 17 Feb 2017 11:00:12 +0000 (12:00 +0100)
committerselias <samelias@cisco.com>
Fri, 17 Feb 2017 11:00:12 +0000 (12:00 +0100)
Change-Id: I5e1ca7619704758f44b51154be62e40dd27e3117
Signed-off-by: selias <samelias@cisco.com>
resources/tools/download_hc_build_pkgs.sh
resources/tools/download_hc_pkgs.sh

index 312d9f3..c83bada 100755 (executable)
@@ -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
index b958dc9..79cccb9 100755 (executable)
@@ -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