X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-hc2vpp-integration-odl.sh;h=a7e7c5724bab7698b256e5c005d8de62cffb57f3;hp=76adc834d446bb690373af88a2a87f3b7fcc8685;hb=eecad36d7d2275fa47fbcab40dbcf56108ab0a51;hpb=df228e1794d4a5a1c3028e1e214731b5f0450b99

diff --git a/bootstrap-hc2vpp-integration-odl.sh b/bootstrap-hc2vpp-integration-odl.sh
index 76adc834d4..a7e7c5724b 100755
--- a/bootstrap-hc2vpp-integration-odl.sh
+++ b/bootstrap-hc2vpp-integration-odl.sh
@@ -29,6 +29,8 @@ VIRL_PKEY=priv_key
 VIRL_SERVER_STATUS_FILE="status"
 VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
 
+ARCHIVE_ARTIFACTS=(log.html output.xml report.html honeycomb.log)
+
 STREAM=$1
 OS=$2
 ODL=$3
@@ -119,7 +121,7 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # Download VPP and HC packages from the current branch
 echo Downloading packages...
-bash ${SCRIPT_DIR}/resources/tools/download_hc_pkgs.sh ${STREAM} ${OS}
+bash ${SCRIPT_DIR}/resources/tools/scripts/download_hc_pkgs.sh ${STREAM} ${OS}
 
 if [ "${OS}" == "centos7" ]; then
     VPP_PKGS=(*.rpm)
@@ -224,13 +226,23 @@ fi
 
 PYTHONPATH=`pwd` pybot -L TRACE -W 136\
     -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
-    --suite "tests.func" \
+    --suite "tests.vpp.func" \
     --include HC_FUNC \
     --exclude HC_REST_ONLY \
     --noncritical EXPECTED_FAILING \
     --variable HC_ODL:${ODL} \
     tests/
 
+RETURN_STATUS=$?
+
 # Get Honeycomb log file from virl host
 scp ${SSH_OPTIONS} \
     ${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/honeycomb.log . || true
+
+# Archive artifacts
+mkdir archive
+for i in ${ARCHIVE_ARTIFACTS[@]}; do
+    cp $( readlink -f ${i} | tr '\n' ' ' ) archive/
+done
+
+exit ${RETURN_STATUS}