X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=bootstrap-verify-perf.sh;h=5540f9f39d5a482903c2aa00b23d310a8cac8d53;hp=47c71b6fb14e1ff49dd3b8ae2a902e01409fa94b;hb=f605477161642ec3414b68702baddbcd6e629048;hpb=a49ab6c44a8ca3f82b15b6ae59237cd340576164 diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index 47c71b6fb1..5540f9f39d 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -203,7 +203,8 @@ case "$TEST_TAG" in ;; VERIFY-PERF-L2 ) TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDl2xcbase' - 'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase') + 'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase' + '!lbond_dpdk') ;; VERIFY-PERF-LISP ) TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDlisp') @@ -212,7 +213,8 @@ case "$TEST_TAG" in TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvxlan') ;; VERIFY-PERF-VHOST ) - TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvhost') + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvhost' + '!lbond_dpdk') ;; VERIFY-PERF-MEMIF ) TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif' @@ -241,7 +243,8 @@ case "$TEST_TAG" in VPP-VERIFY-PERF-L2 ) TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDl2xcbase' 'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase' - 'mrrANDnic_intel-x520-da2AND1t1cANDdot1q') + 'mrrANDnic_intel-x520-da2AND1t1cANDdot1q' + '!lbond_dpdk') ;; VPP-VERIFY-PERF-LISP ) TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDlisp') @@ -250,7 +253,8 @@ case "$TEST_TAG" in TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvxlan') ;; VPP-VERIFY-PERF-VHOST ) - TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvhost') + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvhost' + '!lbond_dpdk') ;; VPP-VERIFY-PERF-MEMIF ) TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif' @@ -276,11 +280,18 @@ case "$TEST_TAG" in TAGS=('perftest') esac -# Catenate TAG selections by 'OR' -printf -v INCLUDES " --include %s " "${TAGS[@]}" +# Catenate TAG selections +EXPANDED_TAGS=() +for TAG in "${TAGS[@]}"; do + if [[ ${TAG} == "!"* ]]; then + EXPANDED_TAGS+=(" --exclude ${TAG#$"!"} ") + else + EXPANDED_TAGS+=(" --include ${TAG} ") + fi +done # Execute the test -pybot ${PYBOT_ARGS}${INCLUDES} tests/ +pybot ${PYBOT_ARGS}${EXPANDED_TAGS} tests/ RETURN_STATUS=$(echo $?) # Archive JOB artifacts in jenkins