csit rls1701 report nits and updates:

[csit.git] / bootstrap-hc2vpp-integration.sh

diff --git a/bootstrap-hc2vpp-integration.sh b/bootstrap-hc2vpp-integration.sh
index 9554924..dd471f3 100755 (executable)
--- a/bootstrap-hc2vpp-integration.sh
+++ b/bootstrap-hc2vpp-integration.sh
@@ -34,6 +34,8 @@ VIRL_RELEASE=csit-ubuntu-14.04.4_2016-10-07_1.3
 
 SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
 
+STREAM=$1
+
 function ssh_do() {
     echo
     echo "### "  ssh $@
@@ -108,9 +110,9 @@ done
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-# Download the latest VPP and HC .deb packages
+# Download VPP and HC .deb packages from the current branch
 echo Downloading packages...
-bash ${SCRIPT_DIR}/resources/tools/download_hc_pkgs.sh
+bash ${SCRIPT_DIR}/resources/tools/download_hc_pkgs.sh ${STREAM}
 
 VPP_DEBS=(*.deb)
 echo ${VPP_DEBS[@]}
@@ -210,3 +212,7 @@ PYTHONPATH=`pwd` pybot -L TRACE -W 136\
     --include honeycomb_sanity \
     --noncritical EXPECTED_FAILING \
     tests/
+
+# Get Honeycomb log file from virl host
+scp ${SSH_OPTIONS} \
+    ${VIRL_USERNAME}@${VIRL_SERVER}:/scratch/${VIRL_SID}/honeycomb.log . || true