X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-hc2vpp-integration.sh;h=f7e9be44fd082720b2c978f606bed70b5be28126;hp=eec9eef400e40796c52511d1ffac498c8494906c;hb=df5ed0d9317e2a1d4a7248459cc6aec39f80a052;hpb=5e59e02d72a8c98b1fa54a8c863349c605ef095a

diff --git a/bootstrap-hc2vpp-integration.sh b/bootstrap-hc2vpp-integration.sh
index eec9eef400..f7e9be44fd 100755
--- a/bootstrap-hc2vpp-integration.sh
+++ b/bootstrap-hc2vpp-integration.sh
@@ -29,18 +29,17 @@ 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
 
-if [ "${OS}" == "ubuntu1404" ]; then
-    VIRL_TOPOLOGY=double-ring-nested.trusty
-    VIRL_RELEASE=csit-ubuntu-14.04.4_2016-10-07_1.3
-elif [ "${OS}" == "ubuntu1604" ]; then
+if [ "${OS}" == "ubuntu1604" ]; then
     VIRL_TOPOLOGY=double-ring-nested.xenial
-    VIRL_RELEASE=csit-ubuntu-16.04.1_2016-12-19_1.6
+    VIRL_RELEASE=csit-ubuntu-16.04.1_2017-02-23_1.8
 elif [ "${OS}" == "centos7" ]; then
     VIRL_TOPOLOGY=double-ring-nested.centos7
-    VIRL_RELEASE=csit-centos-7.3-1611
+    VIRL_RELEASE=csit-centos-7.3-1611_2017-02-23_1.4
 fi
 
 SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
@@ -121,7 +120,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)
@@ -226,11 +225,21 @@ fi
 
 PYTHONPATH=`pwd` pybot -L TRACE -W 136\
     -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
-    --suite "tests.func" \
-    --include honeycomb_sanity \
+    --suite "tests.vpp.func" \
+    --include HC_FUNC \
     --noncritical EXPECTED_FAILING \
     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}