X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-centos.sh;h=56f50b21cf9b6a50131dedf937072cdbdd8391d6;hp=b0b9562274c84ec8e3da4325545d049cec2aa2eb;hb=2c4babd95c188b8b0038f6f39448cb469b9bc23a;hpb=fa14d9f454a7248a71135375bfb0758cdb532ca7 diff --git a/bootstrap-centos.sh b/bootstrap-centos.sh index b0b9562274..56f50b21cf 100755 --- a/bootstrap-centos.sh +++ b/bootstrap-centos.sh @@ -33,8 +33,9 @@ VIRL_RELEASE=$(cat ${SCRIPT_DIR}/VIRL_RELEASE_CENTOS) 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 @@ -129,6 +130,7 @@ VPP_CLASSIFIER="" if [ "${#}" -ne "0" ]; then arr=(${@}) echo ${arr[0]} + SKIP_PATCH="skip_patchORskip_vpp_patch" else rm -f *.rpm VPP_STABLE_VER=$(cat ${SCRIPT_DIR}/VPP_STABLE_VER_CENTOS) @@ -259,7 +261,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/" @@ -270,7 +272,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/