Update of bootstrap-verify-master.sh file.

- VIRL image switched to double-ring-nested topology
- removed exclusion of 3_NODE_DOUBLE_LINK_TOPO test cases
- included test cases with tags:
  - VM_ENV and 3_NODE_SINGLE_LINK_TOPO
  - VM_ENV and 3_NODE_DOUBLE_LINK_TOPO

Change-Id: I99084b57c1fdd4aefb028cb144822a645baf9321
Signed-off-by: Jan Gelety <jgelety@cisco.com>

diff --git a/bootstrap-verify-master.sh b/bootstrap-verify-master.sh
index 5f560ce..c09ce7b 100755 (executable)
--- a/bootstrap-verify-master.sh
+++ b/bootstrap-verify-master.sh
@@ -107,7 +107,7 @@ function stop_virl_simulation {
 
 VIRL_SID=$(ssh -i priv_key -o StrictHostKeyChecking=no \
     ${VIRL_USERNAME}@${VIRL_SERVER} \
-    "/home/jenkins-in/testcase-infra/bin/start-testcase -c simple-ring ${VPP_DEBS_FULL[@]}")
+    "/home/jenkins-in/testcase-infra/bin/start-testcase -c double-ring-nested ${VPP_DEBS_FULL[@]}")
 retval=$?
 if [ "$?" -ne "0" ]; then
     echo "VIRL simulation start failed"
@@ -152,8 +152,8 @@ do
     echo ${test_set}. test loop
     PYTHONPATH=`pwd` pybot -L TRACE \
         -v TOPOLOGY_PATH:topologies/enabled/topology.yaml \
-        --exclude 3_node_double_link_topoNOT3_node_single_link_topo \
-        --include VM_ENV \
+        --include vm_envAND3_node_single_link_topo \
+        --include vm_envAND3_node_double_link_topo \
         --exclude PERFTEST \
         --noncritical EXPECTED_FAILING \
         --output log_test_set${test_set} \