Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
FIX: TAG processing
[csit.git]
/
bootstrap-verify-perf.sh
diff --git
a/bootstrap-verify-perf.sh
b/bootstrap-verify-perf.sh
index
667c1d0
..
7b1aa26
100755
(executable)
--- a/
bootstrap-verify-perf.sh
+++ b/
bootstrap-verify-perf.sh
@@
-203,16
+203,18
@@
case "$TEST_TAG" in
;;
VERIFY-PERF-L2 )
TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDl2xcbase'
;;
VERIFY-PERF-L2 )
TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDl2xcbase'
- 'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase')
+ 'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase'
+ '!lbond_dpdk')
;;
VERIFY-PERF-LISP )
;;
VERIFY-PERF-LISP )
- TAGS=('
pdrchk
ANDnic_intel-x520-da2AND1t1cANDlisp')
+ TAGS=('
mrr
ANDnic_intel-x520-da2AND1t1cANDlisp')
;;
VERIFY-PERF-VXLAN )
;;
VERIFY-PERF-VXLAN )
- TAGS=('
pdrchk
ANDnic_intel-x520-da2AND1t1cANDvxlan')
+ TAGS=('
mrr
ANDnic_intel-x520-da2AND1t1cANDvxlan')
;;
VERIFY-PERF-VHOST )
;;
VERIFY-PERF-VHOST )
- TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDvhost')
+ TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDvhost'
+ '!lbond_dpdk')
;;
VERIFY-PERF-MEMIF )
TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif'
;;
VERIFY-PERF-MEMIF )
TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDmemif'
@@
-226,6
+228,10
@@
case "$TEST_TAG" in
'mrrANDnic_intel-xl710AND1t1cANDipsechw'
'mrrANDnic_intel-xl710AND2t2cANDipsechw')
;;
'mrrANDnic_intel-xl710AND1t1cANDipsechw'
'mrrANDnic_intel-xl710AND2t2cANDipsechw')
;;
+ VERIFY-PERF-SRV6 )
+ TAGS=('mrrANDsrv6AND1t1c'
+ 'mrrANDsrv6AND2t2c')
+ ;;
VPP-VERIFY-PERF-IP4 )
TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDip4base'
'mrrANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m')
VPP-VERIFY-PERF-IP4 )
TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDip4base'
'mrrANDnic_intel-x520-da2AND1t1cANDip4fwdANDfib_2m')
@@
-236,16
+242,19
@@
case "$TEST_TAG" in
;;
VPP-VERIFY-PERF-L2 )
TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDl2xcbase'
;;
VPP-VERIFY-PERF-L2 )
TAGS=('mrrANDnic_intel-x520-da2AND1t1cANDl2xcbase'
- 'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase')
+ 'mrrANDnic_intel-x520-da2AND1t1cANDl2bdbase'
+ 'mrrANDnic_intel-x520-da2AND1t1cANDdot1q'
+ '!lbond_dpdk')
;;
VPP-VERIFY-PERF-LISP )
;;
VPP-VERIFY-PERF-LISP )
- TAGS=('
pdrchk
ANDnic_intel-x520-da2AND1t1cANDlisp')
+ TAGS=('
mrr
ANDnic_intel-x520-da2AND1t1cANDlisp')
;;
VPP-VERIFY-PERF-VXLAN )
;;
VPP-VERIFY-PERF-VXLAN )
- TAGS=('
pdrchk
ANDnic_intel-x520-da2AND1t1cANDvxlan')
+ TAGS=('
mrr
ANDnic_intel-x520-da2AND1t1cANDvxlan')
;;
VPP-VERIFY-PERF-VHOST )
;;
VPP-VERIFY-PERF-VHOST )
- TAGS=('pdrdiscANDnic_intel-x520-da2AND1t1cANDvhost')
+ 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'
@@
-254,8
+263,8
@@
case "$TEST_TAG" in
'mrrANDnic_intel-x520-da2AND2t2cANDmemif')
;;
VPP-VERIFY-PERF-ACL )
'mrrANDnic_intel-x520-da2AND2t2cANDmemif')
;;
VPP-VERIFY-PERF-ACL )
- TAGS=('
pdrdisc
ANDnic_intel-x520-da2AND1t1cANDacl'
- '
pdrdisc
ANDnic_intel-x520-da2AND2t2cANDacl')
+ TAGS=('
mrr
ANDnic_intel-x520-da2AND1t1cANDacl'
+ '
mrr
ANDnic_intel-x520-da2AND2t2cANDacl')
;;
VPP-VERIFY-PERF-IPSECHW )
TAGS=('pdrdiscANDnic_intel-xl710AND1t1cANDipsechw'
;;
VPP-VERIFY-PERF-IPSECHW )
TAGS=('pdrdiscANDnic_intel-xl710AND1t1cANDipsechw'
@@
-263,15
+272,26
@@
case "$TEST_TAG" in
'mrrANDnic_intel-xl710AND1t1cANDipsechw'
'mrrANDnic_intel-xl710AND2t2cANDipsechw')
;;
'mrrANDnic_intel-xl710AND1t1cANDipsechw'
'mrrANDnic_intel-xl710AND2t2cANDipsechw')
;;
+ VPP-VERIFY-PERF-SRV6 )
+ TAGS=('mrrANDsrv6AND1t1c'
+ 'mrrANDsrv6AND2t2c')
+ ;;
* )
TAGS=('perftest')
esac
* )
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
# Execute the test
-pybot ${PYBOT_ARGS}${
INCLUDES
} tests/
+pybot ${PYBOT_ARGS}${
EXPANDED_TAGS[@]
} tests/
RETURN_STATUS=$(echo $?)
# Archive JOB artifacts in jenkins
RETURN_STATUS=$(echo $?)
# Archive JOB artifacts in jenkins
@@
-283,4
+303,4
@@
for i in ${LOG_ARCHIVE_ARTIFACTS[@]}; do
cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVE_DIR}/
done
cp $( readlink -f ${i} | tr '\n' ' ' ) ${LOG_ARCHIVE_DIR}/
done
-exit ${RETURN_STATUS}
\ No newline at end of file
+exit ${RETURN_STATUS}