X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-hc2vpp-integration-odl.sh;h=900e6deee31bf5edbbc77c77d4e7215459306653;hp=fc7f732008e67ed0e0e31f4bcb98c047e6f167e1;hb=b892452e1fe2d226f526f9a0685b1095e36b8050;hpb=6721e7f09aa95bff6622068332a3f56afad9c87b

diff --git a/bootstrap-hc2vpp-integration-odl.sh b/bootstrap-hc2vpp-integration-odl.sh
index fc7f732008..900e6deee3 100755
--- a/bootstrap-hc2vpp-integration-odl.sh
+++ b/bootstrap-hc2vpp-integration-odl.sh
@@ -17,9 +17,7 @@ set -x
 cat /etc/hostname
 cat /etc/hosts
 
-export DEBIAN_FRONTEND=noninteractive
-sudo apt-get -y update
-sudo apt-get -y install libpython2.7-dev python-virtualenv
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 VIRL_SERVERS=("10.30.51.28" "10.30.51.29" "10.30.51.30")
 VIRL_SERVER=""
@@ -29,16 +27,24 @@ 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
 
-if [ "${OS}" == "ubuntu1604" ]; then
-    VIRL_TOPOLOGY=double-ring-nested.xenial
-    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_2017-02-23_1.4
+if [ -f "/etc/redhat-release" ]; then
+    DISTRO="CENTOS"
+    sudo yum install -y python-devel python-virtualenv
+    VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_CENTOS)
+    VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_CENTOS)
+else
+    DISTRO="UBUNTU"
+    export DEBIAN_FRONTEND=noninteractive
+    sudo apt-get -y update
+    sudo apt-get -y install libpython2.7-dev python-virtualenv
+    VIRL_TOPOLOGY=$(cat ${SCRIPT_DIR}/VIRL_TOPOLOGY_UBUNTU)
+    VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_UBUNTU)
 fi
 
 SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
@@ -222,15 +228,26 @@ if [ "$?" -ne "0" ]; then
     echo "However, the tests will start."
 fi
 
+# TODO(CSIT-994): reenable NSH
 PYTHONPATH=`pwd` pybot -L TRACE -W 136\
     -v TOPOLOGY_PATH:${SCRIPT_DIR}/topologies/enabled/topology.yaml \
-    --suite "tests.vpp.func" \
+    --suite "tests.honeycomb.func" \
     --include HC_FUNC \
-    --exclude HC_REST_ONLY \
+    --exclude HC_NSHORHC_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}