Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Improve 1n-skx vpp_device mapping function
[csit.git]
/
resources
/
libraries
/
bash
/
function
/
common.sh
diff --git
a/resources/libraries/bash/function/common.sh
b/resources/libraries/bash/function/common.sh
index
db3d865
..
5982af9
100644
(file)
--- a/
resources/libraries/bash/function/common.sh
+++ b/
resources/libraries/bash/function/common.sh
@@
-555,7
+555,7
@@
function select_tags () {
test_tag_array=("ndrpdrAND64bAND1c"
"ndrpdrAND78bAND1c")
;;
test_tag_array=("ndrpdrAND64bAND1c"
"ndrpdrAND78bAND1c")
;;
- *"mrr-daily"*
| *"mrr-weekly"*
)
+ *"mrr-daily"* )
test_tag_array=(# vic
"mrrANDnic_cisco-vic-1227AND64b"
"mrrANDnic_cisco-vic-1385AND64b"
test_tag_array=(# vic
"mrrANDnic_cisco-vic-1227AND64b"
"mrrANDnic_cisco-vic-1385AND64b"
@@
-637,12
+637,22
@@
function select_tags () {
# vm vhost ip4 base
"mrrANDvhostANDip4fwdANDbaseAND64b"
"mrrANDvhostANDip4fwdANDbaseANDimix"
# vm vhost ip4 base
"mrrANDvhostANDip4fwdANDbaseAND64b"
"mrrANDvhostANDip4fwdANDbaseANDimix"
+ # DPDK
+ "mrrANDdpdkAND64b"
# Exclude
"!mrrANDip6baseANDdot1qAND78b"
"!vhost_256ANDnic_intel-x520-da2"
"!vhostANDnic_intel-xl710"
"!cfs_opt"
# Exclude
"!mrrANDip6baseANDdot1qAND78b"
"!vhost_256ANDnic_intel-x520-da2"
"!vhostANDnic_intel-xl710"
"!cfs_opt"
- "!lbond_dpdk")
+ "!lbond_dpdk"
+ "!nf_density")
+ ;;
+ *"mrr-weekly"* )
+ test_tag_array=(# NF Density tests
+ "mrrANDnf_densityAND64b"
+ "mrrANDnf_densityANDimix"
+ # DPDK
+ "mrrANDdpdkAND64b")
;;
* )
if [[ -z "${TEST_TAG_STRING-}" ]]; then
;;
* )
if [[ -z "${TEST_TAG_STRING-}" ]]; then
@@
-780,7
+790,7
@@
function select_topology () {
TOPOLOGIES=(
"${TOPOLOGIES_DIR}/lf_2n_skx_testbed21.yaml"
#"${TOPOLOGIES_DIR}/lf_2n_skx_testbed22.yaml"
TOPOLOGIES=(
"${TOPOLOGIES_DIR}/lf_2n_skx_testbed21.yaml"
#"${TOPOLOGIES_DIR}/lf_2n_skx_testbed22.yaml"
-
#
"${TOPOLOGIES_DIR}/lf_2n_skx_testbed23.yaml"
+ "${TOPOLOGIES_DIR}/lf_2n_skx_testbed23.yaml"
"${TOPOLOGIES_DIR}/lf_2n_skx_testbed24.yaml"
)
TOPOLOGIES_TAGS="2_node_*_link_topo"
"${TOPOLOGIES_DIR}/lf_2n_skx_testbed24.yaml"
)
TOPOLOGIES_TAGS="2_node_*_link_topo"