Align suite/test teardown/setup

[csit.git] / bootstrap-vpp-verify-weekly.sh

diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh
index feced87..4dc64fa 100644 (file)
--- a/bootstrap-vpp-verify-weekly.sh
+++ b/bootstrap-vpp-verify-weekly.sh
@@ -59,7 +59,6 @@ if [ "${#}" -ne "0" ]; then
     echo ${arr[0]}
 else
     # Download the specific VPP build install packages
-    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"
@@ -69,7 +68,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[@]}
 
@@ -216,7 +215,7 @@ RC=0
 MORE_FAILS=0
 
 partial_logs=""
-for test_set in 1 2 3
+for test_set in 1 2
 do
     echo
     echo ${test_set}. test loop
@@ -226,6 +225,8 @@ do
         --include vm_envAND3_node_single_link_topo \
         --include vm_envAND3_node_double_link_topo \
         --exclude PERFTEST \
+        --exclude SOFTWIRE \
+        --exclude SKIP_TEST \
         --noncritical EXPECTED_FAILING \
         --output ${LOG_PATH}/output_test_set${test_set} \
         tests/