- Improve TAG post processing
Change-Id: I5a36f5874ea747cbcae2562fc58c9f5abe9bac02
Signed-off-by: Peter Mikus <pmikus@cisco.com>
;;
VERIFY-PERF-L2 )
TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDl2xcbase'
;;
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')
;;
VERIFY-PERF-LISP )
TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDlisp')
TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvxlan')
;;
VERIFY-PERF-VHOST )
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'
;;
VERIFY-PERF-MEMIF )
TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif'
VPP-VERIFY-PERF-L2 )
TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDl2xcbase'
'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase'
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')
;;
VPP-VERIFY-PERF-LISP )
TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDlisp')
TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvxlan')
;;
VPP-VERIFY-PERF-VHOST )
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'
;;
VPP-VERIFY-PERF-MEMIF )
TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif'
-# 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
-pybot ${PYBOT_ARGS}${INCLUDES}${EXCLUDES} tests/
+pybot ${PYBOT_ARGS}${EXPANDED_TAGS} tests/
RETURN_STATUS=$(echo $?)
# Archive JOB artifacts in jenkins
RETURN_STATUS=$(echo $?)
# Archive JOB artifacts in jenkins
| Library | resources.libraries.python.Policer
| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | MRR
| 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
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L3 | Intel-X520-DA2
| Library | resources.libraries.python.Policer
| ...
| Force Tags | 3_NODE_SINGLE_LINK_TOPO | PERFTEST | HW_ENV | NDRPDRDISC
| 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
| ...
| Suite Setup | Set up 3-node performance topology with DUT's NIC model
| ... | L3 | Intel-X520-DA2