X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-TLDK.sh;h=4f731cd52790d793cf267228ddf11ec90930a6a3;hp=7edaa4ef13e24335bec5859053a32c6081ce8d3e;hb=61407a72649b7b355472350c2186aa36bf8182e7;hpb=28e640943cc0c4ed7e896f6c2d933c88f969c7c5 diff --git a/bootstrap-TLDK.sh b/bootstrap-TLDK.sh index 7edaa4ef13..4f731cd527 100755 --- a/bootstrap-TLDK.sh +++ b/bootstrap-TLDK.sh @@ -17,6 +17,8 @@ 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} @@ -118,7 +120,7 @@ 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 @@ -195,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}