CSIT-651 Add keywords and template for memif

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

diff --git a/bootstrap-hc2vpp-verify.sh b/bootstrap-hc2vpp-verify.sh
index af21842..b642da7 100755 (executable)
--- a/bootstrap-hc2vpp-verify.sh
+++ b/bootstrap-hc2vpp-verify.sh
@@ -31,15 +31,12 @@ VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
 
 OS=$1
 
-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"
@@ -146,8 +143,13 @@ for index in "${!VIRL_SERVER[@]}"; do
     if [ "${copy}" -eq "0" ]; then
         echo "files have already been copied to the VIRL host ${VIRL_SERVER[${index}]}"
     else
-        scp ${SSH_OPTIONS} *.deb *.rpm \
-        ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/
+        if [ "${OS}" == "centos7" ]; then
+            scp ${SSH_OPTIONS} *.rpm \
+                ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/
+        else
+            scp ${SSH_OPTIONS} *.deb \
+                ${VIRL_USERNAME}@${VIRL_SERVER[${index}]}:${VIRL_DIR_LOC}/
+        fi
          result=$?
         if [ "${result}" -ne "0" ]; then
             echo "Failed to copy files to VIRL host ${VIRL_SERVER[${index}]}"
@@ -217,8 +219,8 @@ 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/