diff options
Diffstat (limited to 'bootstrap-ubuntu.sh')
| -rwxr-xr-x | bootstrap-ubuntu.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bootstrap-ubuntu.sh b/bootstrap-ubuntu.sh index 3e130f83f9..c5e1824934 100755 --- a/bootstrap-ubuntu.sh +++ b/bootstrap-ubuntu.sh @@ -35,8 +35,9 @@ VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_UBUNTU) SSH_OPTIONS="-i ${VIRL_PKEY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o BatchMode=yes -o LogLevel=error" -TEST_GROUPS=("l2bd,dhcp,gre,honeycomb,l2xc,lisp,softwire" "cop,telemetry,ipsec,ipv6,rpf,tap,vrf" "fds,iacl,ipv4,policer,vlan,vxlan,vhost") +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" +SKIP_PATCH="SKIP_PATCH" # Create tmp dir mkdir ${SCRIPT_DIR}/tmp @@ -132,6 +133,7 @@ VPP_CLASSIFIER="-deb" 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 wget -q "${VPP_REPO_URL}/vpp-dpdk-dkms/${DPDK_STABLE_VER}/vpp-dpdk-dkms-${DPDK_STABLE_VER}${VPP_CLASSIFIER}.deb" || exit else @@ -265,7 +267,7 @@ function run_test_set() { --include vm_envAND3_node_single_link_topo \ --include vm_envAND3_node_double_link_topo \ --exclude PERFTEST \ - --exclude SKIP_PATCH \ + --exclude ${SKIP_PATCH} \ --noncritical EXPECTED_FAILING \ --output ${LOG_PATH}/log_test_set_run${nr} \ tests/" @@ -276,7 +278,7 @@ function run_test_set() { --include vm_envAND3_node_single_link_topo \ --include vm_envAND3_node_double_link_topo \ --exclude PERFTEST \ - --exclude SKIP_PATCH \ + --exclude ${SKIP_PATCH} \ --noncritical EXPECTED_FAILING \ --output ${LOG_PATH}/log_test_set_run${nr} \ tests/ |