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

diff --git a/bootstrap.sh b/bootstrap.sh
index d37f704aa1..152a397e4e 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[@]}
 
@@ -319,7 +318,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 +331,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/