diff options
| author |   Peter Mikus <pmikus@cisco.com> | 2018-06-13 12:25:51 +0000 |
|---|---|---|
| committer | Peter Mikus <pmikus@cisco.com> | 2018-06-13 12:38:40 +0000 |
| commit | f605477161642ec3414b68702baddbcd6e629048 (patch) | |
| tree | 7bfbbe2b7d5435378014dcb87afa36da26a0e499 | |
| parent | 401af1e0e6bddb4ad2aed28de66f13ece2436937 (diff) | |
FIX: TAG processing
- Improve TAG post processing
Change-Id: I5a36f5874ea747cbcae2562fc58c9f5abe9bac02
Signed-off-by: Peter Mikus <pmikus@cisco.com>
3 files changed, 20 insertions, 14 deletions
diff --git a/bootstrap-verify-perf.sh b/bootstrap-verify-perf.sh index a944ea3653..5540f9f39d 100755 --- a/bootstrap-verify-perf.sh +++ b/bootstrap-verify-perf.sh @@ -203,8 +203,8 @@ case "$TEST_TAG" in ;; VERIFY-PERF-L2 ) TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDl2xcbase' - 'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase') - ETAGS=('lbond_dpdk') + 'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase' + '!lbond_dpdk') ;; VERIFY-PERF-LISP ) TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDlisp') @@ -213,8 +213,8 @@ case "$TEST_TAG" in TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvxlan') ;; VERIFY-PERF-VHOST ) - TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvhost') - ETAGS=('lbond_dpdk') + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvhost' + '!lbond_dpdk') ;; VERIFY-PERF-MEMIF ) TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif' @@ -243,8 +243,8 @@ case "$TEST_TAG" in VPP-VERIFY-PERF-L2 ) TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDl2xcbase' 'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase' - 'mrrANDnic_intel-x520-da2AND1t1cANDdot1q') - ETAGS=('lbond_dpdk') + 'mrrANDnic_intel-x520-da2AND1t1cANDdot1q' + '!lbond_dpdk') ;; VPP-VERIFY-PERF-LISP ) TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDlisp') @@ -253,8 +253,8 @@ case "$TEST_TAG" in TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvxlan') ;; VPP-VERIFY-PERF-VHOST ) - TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvhost') - ETAGS=('lbond_dpdk') + TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvhost' + '!lbond_dpdk') ;; VPP-VERIFY-PERF-MEMIF ) TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif' @@ -280,12 +280,18 @@ case "$TEST_TAG" in TAGS=('perftest') esac -# Catenate TAG selections by 'OR' -if [[ ! -z "$TAGS" ]]; then printf -v INCLUDES " --include %s " "${TAGS[@]}"; fi -if [[ ! -z "$ETAGS" ]]; then printf -v EXCLUDES " --exclude %s " "${ETAGS[@]}"; fi +# 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}${EXCLUDES} tests/ +pybot ${PYBOT_ARGS}${EXPANDED_TAGS} tests/ RETURN_STATUS=$(echo $?) # Archive JOB artifacts in jenkins diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-mrr.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-mrr.robot index 72ba46726a..b6222a5fa5 100644 --- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-mrr.robot +++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-mrr.robot @@ -16,7 +16,7 @@ | Library | resources.libraries.python.Policer | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR -| ... | NIC_Intel-X520-DA2 | IP4FWD | BASE | DOT1Q +| ... | NIC_Intel-X520-DA2 | IP4FWD | BASE | POLICE_MARK | ... | Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 diff --git a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdrdisc.robot b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdrdisc.robot index 63c186c376..51baa78143 100644 --- a/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdrdisc.robot +++ b/tests/vpp/perf/ip4/10ge2p1x520-ethip4-ip4base-ipolicemarkbase-ndrpdrdisc.robot @@ -16,7 +16,7 @@ | Library | resources.libraries.python.Policer | ... | Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC -| ... | NIC_Intel-X520-DA2 | IP4FWD | BASE | DOT1Q +| ... | NIC_Intel-X520-DA2 | IP4FWD | BASE | POLICE_MARK | ... | Suite Setup | Set up 3-node performance topology with DUT's NIC model | ... | L3 | Intel-X520-DA2 |