X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap.sh;h=ebbe752a4eedeecf54d17aafffab722177b954b3;hp=b7525754fcf17cbccc2662ac245df1ee6036517e;hb=b6d7373834eb3fa6e8543be9c8379507d6d91273;hpb=e2f9bdd098fb0008cc4fc2f8c8298ebe0d6ef062

diff --git a/bootstrap.sh b/bootstrap.sh
index b7525754fc..ebbe752a4e 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -23,7 +23,7 @@ export PYTHONPATH=${SCRIPT_DIR}
 if [ -f "/etc/redhat-release" ]; then
     DISTRO="CENTOS"
     sudo yum install -y python-devel python-virtualenv
-    VPP_ARTIFACTS="vpp vpp-debuginfo vpp-devel vpp-lib vpp-plugins"
+    VPP_ARTIFACTS="vpp vpp-devel vpp-lib vpp-plugins"
     DPDK_ARTIFACTS=""
     PACKAGE="rpm"
     VPP_CLASSIFIER=""
@@ -54,9 +54,9 @@ VIRL_SERVERS=("10.30.51.28" "10.30.51.29" "10.30.51.30")
 IPS_PER_VIRL=( "10.30.51.28:252"
                "10.30.51.29:74"
                "10.30.51.30:74" )
-VMS_PER_VIRL=( "10.30.51.28:36"
-               "10.30.51.29:36"
-               "10.30.51.30:36" )
+SIMS_PER_VIRL=( "10.30.51.28:13"
+               "10.30.51.29:13"
+               "10.30.51.30:13" )
 IPS_PER_SIMULATION=5
 
 function get_max_ip_nr() {
@@ -72,17 +72,17 @@ function get_max_ip_nr() {
     echo "$IP_VALUE"
 }
 
-function get_max_vm_nr() {
+function get_max_sim_nr() {
     virl_server=$1
-    VM_VALUE="0"
-    for item in "${VMS_PER_VIRL[@]}" ; do
+    SIM_VALUE="0"
+    for item in "${SIMS_PER_VIRL[@]}" ; do
         if [ "${item%%:*}" == "${virl_server}" ]
         then
-            VM_VALUE=${item#*:}
+            SIM_VALUE=${item#*:}
             break
         fi
     done
-    echo "$VM_VALUE"
+    echo "$SIM_VALUE"
 }
 
 VIRL_USERNAME=jenkins-in
@@ -92,8 +92,8 @@ 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=("gre,ipv6,lisp,policer,rpf,softwire" "dhcp,ipsec,l2bd,l2xc,telemetry,vrf,vxlan" "cop,fds,honeycomb,iacl,ipv4,tap,vhost,vlan")
-SUITE_PATH="tests.func"
+TEST_GROUPS=("crypto,ip4_tunnels.softwire,ip4_tunnels.vxlan,telemetry" "ip4,ip4_tunnels.gre,ip4_tunnels.lisp,ip6_tunnels.vxlan,vm_vhost.ip4,vm_vhost.ip6" "interfaces,ip6,ip6_tunnels.lisp,l2bd,l2xc,vm_vhost.l2bd,vm_vhost.l2xc")
+SUITE_PATH="tests.vpp.func"
 SKIP_PATCH="SKIP_PATCH"
 
 # Create tmp dir
@@ -195,10 +195,6 @@ if [ "${#}" -ne "0" ]; then
     arr=(${@})
     echo ${arr[0]}
     SKIP_PATCH="skip_patchORskip_vpp_patch"
-    # Download DPDK parts not included in dpdk plugin of vpp build
-    for ARTIFACT in ${DPDK_ARTIFACTS}; do
-        wget -q "${VPP_REPO_URL}/${ARTIFACT}/${DPDK_STABLE_VER}/${ARTIFACT}-${DPDK_STABLE_VER}${VPP_CLASSIFIER}.${PACKAGE}" || exit
-    done
 else
     rm -f *.${PACKAGE}
     for ARTIFACT in ${DPDK_ARTIFACTS}; do
@@ -263,9 +259,9 @@ for index in "${!VIRL_SERVER[@]}"; do
     echo "Starting simulation nr. ${index} on VIRL server ${VIRL_SERVER[${index}]}"
     # Get given VIRL server limits for max. number of VMs and IPs
     max_ips=$(get_max_ip_nr ${VIRL_SERVER[${index}]})
-    max_ips_from_vms=$(($(get_max_vm_nr ${VIRL_SERVER[${index}]})*IPS_PER_SIMULATION))
+    max_ips_from_sims=$(($(get_max_sim_nr ${VIRL_SERVER[${index}]})*IPS_PER_SIMULATION))
     # Set quota to lower value
-    IP_QUOTA=$([ $max_ips -le $max_ips_from_vms ] && echo "$max_ips" || echo "$max_ips_from_vms")
+    IP_QUOTA=$([ $max_ips -le $max_ips_from_sims ] && echo "$max_ips" || echo "$max_ips_from_sims")
     # Start the simulation
     VIRL_SID[${index}]=$(ssh ${SSH_OPTIONS} \
         ${VIRL_USERNAME}@${VIRL_SERVER[${index}]} \