X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap.sh;h=fac874546db7236d539cb2f37a3a4c5fdeb6229b;hp=03d7effc465c601d3c6b2b54d4091971adde8a10;hb=bf05994fbf8308bb2482c494a2b28949837fcc6f;hpb=f3e74e6b21a5d5568f4bd1357222e8a014d8397c

diff --git a/bootstrap.sh b/bootstrap.sh
index 03d7effc46..fac874546d 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -26,13 +26,15 @@ OS_VERSION_ID=$(grep '^VERSION_ID=' /etc/os-release | cut -f2- -d= | sed -e 's/\
 if [ "$OS_ID" == "centos" ]; then
     DISTRO="CENTOS"
     PACKAGE="rpm"
-    sudo yum install -y python-devel python-virtualenv
+    # TODO: Remove when corresponding part of CSIT-1546 is addressed.
+    sudo yum install -y python-devel python-virtualenv openssh-clients sshpass
 elif [ "$OS_ID" == "ubuntu" ]; then
     DISTRO="UBUNTU"
     PACKAGE="deb"
+    # TODO: Remove when corresponding part of CSIT-1546 is addressed.
     export DEBIAN_FRONTEND=noninteractive
     sudo apt-get -y update
-    sudo apt-get -y install libpython2.7-dev python-virtualenv
+    sudo apt-get -y install libpython2.7-dev python-virtualenv sshpass
 else
     echo "$OS_ID is not yet supported."
     exit 1
@@ -53,7 +55,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[@]}
 
@@ -101,7 +103,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,l2bd" "ip4,ip6_tunnels,l2xc")
 SUITE_PATH="tests.vpp.func"
 SKIP_PATCH="SKIP_PATCH"
 
@@ -249,6 +251,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
@@ -318,7 +321,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/"
@@ -329,7 +334,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/