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

diff --git a/bootstrap-nsh_sfc-functional-virl.sh b/bootstrap-nsh_sfc-functional-virl.sh
index 35754bb143..034ea9bfd4 100755
--- a/bootstrap-nsh_sfc-functional-virl.sh
+++ b/bootstrap-nsh_sfc-functional-virl.sh
@@ -17,6 +17,8 @@ set -x
 cat /etc/hostname
 cat /etc/hosts
 
+ARCHIVE_ARTIFACTS=(log.html output.xml report.html)
+
 export DEBIAN_FRONTEND=noninteractive
 sudo apt-get -y update
 sudo apt-get -y install libpython2.7-dev python-virtualenv
@@ -127,7 +129,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 +235,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