Use stable/1804 vpp builds for NSH_SFC tests

Change-Id: Iaaf1af31fa526108ebdcf3610bca76346d186183
Signed-off-by: Jan Gelety <jgelety@cisco.com>

2 files changed, 22 insertions, 24 deletions

diff --git a/bootstrap-nsh_sfc-functional-virl.sh b/bootstrap-nsh_sfc-functional-virl.sh
index 034ea9bfd4..aa4d5cc045 100755
--- a/bootstrap-nsh_sfc-functional-virl.sh
+++ b/bootstrap-nsh_sfc-functional-virl.sh
@@ -37,7 +37,7 @@ VIRL_PKEY=priv_key
 VIRL_SERVER_STATUS_FILE="status"
 VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
 
-STREAM="master"
+STREAM="stable.1804"
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export PYTHONPATH=${SCRIPT_DIR}
@@ -158,14 +158,10 @@ for index in "${!VIRL_SERVER[@]}"; do
     if [ "${copy}" -eq "0" ]; then
         echo "files have already been copied to the VIRL host ${VIRL_SERVER[${index}]}"
     else
-        if [ "${OS}" == "centos7" ]; then
-            scp ${SSH_OPTIONS} *.rpm \
-                ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/
-        else
-            scp ${SSH_OPTIONS} *.deb \
-                ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/
-        fi
-         result=$?
+        scp ${SSH_OPTIONS} ${VPP_PKGS[@]} \
+        ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/
+
+        result=$?
         if [ "${result}" -ne "0" ]; then
             echo "Failed to copy files to VIRL host ${VIRL_SERVER[${index}]}"
             echo ${result}
diff --git a/resources/tools/scripts/download_nsh_sfc_pkgs.sh b/resources/tools/scripts/download_nsh_sfc_pkgs.sh
index 2261f084e5..d7a1abc403 100755
--- a/resources/tools/scripts/download_nsh_sfc_pkgs.sh
+++ b/resources/tools/scripts/download_nsh_sfc_pkgs.sh
@@ -15,9 +15,6 @@
 
 set -ex
 
-trap 'rm -f *.deb.md5; exit' EXIT
-trap 'rm -f *.deb.md5;rm -f *.deb; exit' ERR
-
 STREAM=$1
 OS=$2
 
@@ -25,24 +22,29 @@ URL="https://nexus.fd.io/service/local/artifact/maven/content"
 VER="RELEASE"
 GROUP="io.fd.vpp"
 NSH_GROUP="io.fd.nsh_sfc"
-VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dkms vpp-lib vpp-plugins vpp-api-java vpp-api-python vpp-api-lua"
 NSH_ARTIFACTS="vpp-nsh-plugin"
 
-if [ "${OS}" == "ubuntu1404" ]; then
-    OS="ubuntu.trusty.main"
-    PACKAGE="deb deb.md5"
-    CLASS="deb"
-elif [ "${OS}" == "ubuntu1604" ]; then
-    OS="ubuntu.xenial.main"
+if [ "${OS}" == "ubuntu1604" ]; then
+    trap 'rm -f *.deb.md5; exit' EXIT
+    trap 'rm -f *.deb.md5;rm -f *.deb; exit' ERR
+        REPO_OS="ubuntu.xenial.main"
+    VPP_ARTIFACTS="vpp vpp-selinux-policy vpp-devel vpp-lib vpp-plugins vpp-api-java vpp-api-python vpp-api-lua"
     PACKAGE="deb deb.md5"
     CLASS="deb"
+    FILES="*.deb"
+    MD5FILES="*.deb.md5"
 elif [ "${OS}" == "centos7" ]; then
-    OS="centos7"
+    trap 'rm -f *.rpm.md5; exit' EXIT
+    trap 'rm -f *.rpm.md5;rm -f *.rpm; exit' ERR
+    REPO_OS="centos7"
+    VPP_ARTIFACTS="vpp vpp-dbg vpp-dev vpp-dpdk-dkms vpp-lib vpp-plugins vpp-api-java vpp-api-python vpp-api-lua"
     PACKAGE="rpm rpm.md5"
-    CLASS="rpm"
+    CLASS=""
+    FILES="*.rpm"
+    MD5FILES="*.rpm.md5"
 fi
 
-REPO="fd.io.${STREAM}.${OS}"
+REPO="fd.io.${STREAM}.${REPO_OS}"
 
 for ART in ${VPP_ARTIFACTS}; do
     for PAC in $PACKAGE; do
@@ -56,10 +58,10 @@ for ART in ${NSH_ARTIFACTS}; do
     done
 done
 
-for FILE in *.deb; do
+for FILE in ${FILES}; do
     echo " "${FILE} >> ${FILE}.md5
 done
 
-for MD5FILE in *.md5; do
+for MD5FILE in ${MD5FILES}; do
     md5sum -c ${MD5FILE} || exit
 done