X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-TLDK.sh;h=4f731cd52790d793cf267228ddf11ec90930a6a3;hp=48daf9be15ee49e9dc881bcb8a6533452cdae3cd;hb=601629148310349732f76259df0fc5b5e26ea9f7;hpb=b47b29bdbd8c10c8e5fcac6cc9abe72bea75df49

diff --git a/bootstrap-TLDK.sh b/bootstrap-TLDK.sh
index 48daf9be15..4f731cd527 100755
--- a/bootstrap-TLDK.sh
+++ b/bootstrap-TLDK.sh
@@ -17,6 +17,11 @@ set -x
 cat /etc/hostname
 cat /etc/hosts
 
+ARCHIVE_ARTIFACTS=(log.html output.xml report.html)
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+export PYTHONPATH=${SCRIPT_DIR}
+
 export DEBIAN_FRONTEND=noninteractive
 sudo apt-get -y update
 sudo apt-get -y install libpython2.7-dev python-virtualenv
@@ -112,8 +117,10 @@ done
 VIRL_DIR_LOC="/tmp"
 TLDK_TAR_FILE="tldk_depends.tar.gz"
 
+wget "fast.dpdk.org/rel/${DPDK_PACKAGE}"
+
 tar zcf ${TLDK_TAR_FILE} ${DPDK_PACKAGE} ./tldk/ \
-    ./TLDK-tests/tldk_testconfig/ ./TLDK-tests/tldk_deplibs/
+    ./tests/tldk/tldk_testconfig/
 
 cat ${VIRL_PKEY}
 # Copy the files to VIRL host
@@ -190,7 +197,17 @@ fi
 
 PYTHONPATH=`pwd` pybot -L TRACE -W 150 \
     -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
-    --suite "TLDK-tests.func" \
+    --suite "tests.tldk.func" \
     --include vm_envAND3_node_single_link_topo \
     --noncritical EXPECTED_FAILING \
-    TLDK-tests/
+    tests/
+
+RETURN_STATUS=$(echo $?)
+
+# Archive artifacts
+mkdir archive
+for i in ${ARCHIVE_ARTIFACTS[@]}; do
+    cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
+done
+
+exit ${RETURN_STATUS}