X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-nsh_sfc-functional-virl.sh;h=12c77ae30314f3c4fa220c7841b02deb86d5c206;hp=35754bb143a18c8fc0078e49a32eed2f162d6964;hb=76f730530fb632d27aa8c342cb29a7f0655e415d;hpb=55e8f8d168aaa43751cb4d24f40d2eb0b9c89d25

diff --git a/bootstrap-nsh_sfc-functional-virl.sh b/bootstrap-nsh_sfc-functional-virl.sh
index 35754bb143..12c77ae303 100755
--- a/bootstrap-nsh_sfc-functional-virl.sh
+++ b/bootstrap-nsh_sfc-functional-virl.sh
@@ -17,15 +17,7 @@ set -x
 cat /etc/hostname
 cat /etc/hosts
 
-export DEBIAN_FRONTEND=noninteractive
-sudo apt-get -y update
-sudo apt-get -y install libpython2.7-dev python-virtualenv
-
-if [ -f "/etc/redhat-release" ]; then
-    OS="centos7"
-else
-    OS="ubuntu1604"
-fi
+ARCHIVE_ARTIFACTS=(log.html output.xml report.html)
 
 VIRL_SERVERS=("10.30.51.28" "10.30.51.29" "10.30.51.30")
 VIRL_SERVER=""
@@ -35,15 +27,20 @@ VIRL_PKEY=priv_key
 VIRL_SERVER_STATUS_FILE="status"
 VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
 
-STREAM="master"
+STREAM=$1
+OS=$2
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export PYTHONPATH=${SCRIPT_DIR}
 
 if [ "${OS}" == "ubuntu1604" ]; then
+    export DEBIAN_FRONTEND=noninteractive
+    sudo apt-get -y update
+    sudo apt-get -y install libpython2.7-dev python-virtualenv
     VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_UBUNTU)
     VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_UBUNTU)
 elif [ "${OS}" == "centos7" ]; then
+    sudo yum install -y python-devel python-virtualenv
     VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_CENTOS)
     VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_CENTOS)
 else
@@ -127,7 +124,7 @@ done
 
 # Download VPP and NSH SFC packages from the current branch
 echo Downloading packages...
-bash ${SCRIPT_DIR}/resources/tools/download_nsh_sfc_pkgs.sh ${STREAM} ${OS}
+bash ${SCRIPT_DIR}/resources/tools/scripts/download_nsh_sfc_pkgs.sh ${STREAM} ${OS}
 
 if [ "${OS}" == "centos7" ]; then
     VPP_PKGS=(*.rpm)
@@ -233,8 +230,14 @@ fi
 
 PYTHONPATH=`pwd` pybot -L TRACE -W 136\
     -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
-    --suite "nsh_sfc_tests.func" \
+    --suite "tests.nsh_sfc.func" \
     --include vm_envAND3_node_single_link_topo \
     --exclude PERFTEST \
     --exclude SKIP_PATCH \
-    nsh_sfc_tests/
+    tests/
+
+# Archive artifacts
+mkdir archive
+for i in ${ARCHIVE_ARTIFACTS[@]}; do
+    cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
+done