X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap.sh;h=989f786df09cf01b3af33c548f00657d0ee78c3b;hp=d37f704aa1eb9b18fe1f1f0898cebb3018a7a20e;hb=a1d5958923570116e19f6153ae2a35c74f881b13;hpb=8e7582edf682a7ba7edcb5ec0a45d00e361ec868

diff --git a/bootstrap.sh b/bootstrap.sh
index d37f704aa1..989f786df0 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -44,7 +44,6 @@ if [ "${#}" -ne "0" ]; then
     echo ${arr[0]}
     SKIP_PATCH="skip_patchORskip_vpp_patch"
 else
-    DKMS_VERSION=$(< ${SCRIPT_DIR}/DPDK_STABLE_VER)
     VPP_VERSION=$(< ${SCRIPT_DIR}/VPP_STABLE_VER_${DISTRO})
     CSIT_DIR=${SCRIPT_DIR}
     source "${SCRIPT_DIR}/resources/libraries/bash/function/artifacts.sh"
@@ -54,7 +53,7 @@ else
 fi
 
 VIRL_DIR_LOC="/tmp/"
-VPP_PKGS=(vpp*.$PACKAGE)
+VPP_PKGS=(*vpp*.$PACKAGE)
 VPP_PKGS_FULL=("${VPP_PKGS[@]/#/${VIRL_DIR_LOC}}")
 echo ${VPP_PKGS[@]}
 
@@ -102,7 +101,7 @@ VIRL_SERVER_EXPECTED_STATUS="PRODUCTION"
 
 SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error"
 
-TEST_GROUPS=("crypto,ip4_tunnels.softwire,ip4_tunnels.vxlan" "ip4,ip4_tunnels.gre,ip4_tunnels.lisp,ip6_tunnels.vxlan,ip6_tunnels.lisp,vm_vhost.ip4,vm_vhost.ip6" "interfaces,ip6,l2bd,l2xc,vm_vhost.l2bd,vm_vhost.l2xc,telemetry")
+TEST_GROUPS=("ip4_tunnels,ip6,ip6_tunnels,l2bd" "ip4,l2xc,telemetry")
 SUITE_PATH="tests.vpp.func"
 SKIP_PATCH="SKIP_PATCH"
 
@@ -250,6 +249,7 @@ for index in "${!VIRL_SERVER[@]}"; do
         "start-testcase -vv \
             --quota ${IP_QUOTA} \
             --copy ${VIRL_TOPOLOGY} \
+            --expiry 180 \
             --release ${VIRL_RELEASE} \
             ${VPP_PKGS_FULL[@]}")
         # TODO: remove param ${VPP_PKGS_FULL[@]} when start-testcase script is
@@ -319,7 +319,9 @@ function run_test_set() {
         --include vm_envAND3_node_single_link_topo \
         --include vm_envAND3_node_double_link_topo \
         --exclude PERFTEST \
+        --exclude SOFTWIRE \
         --exclude ${SKIP_PATCH} \
+        --exclude SKIP_TEST \
         --noncritical EXPECTED_FAILING \
         --output ${LOG_PATH}/log_test_set_run${nr} \
         tests/"
@@ -330,7 +332,9 @@ function run_test_set() {
         --include vm_envAND3_node_single_link_topo \
         --include vm_envAND3_node_double_link_topo \
         --exclude PERFTEST \
+        --exclude SOFTWIRE \
         --exclude ${SKIP_PATCH} \
+        --exclude SKIP_TEST \
         --noncritical EXPECTED_FAILING \
         --output ${LOG_PATH}/log_test_set_run${nr} \
         tests/