;;
*"perf"*)
# On parsing error, ${trigger} stays empty.
- trigger="$(echo "${GERRIT_EVENT_COMMENT_TEXT}" \
- | grep -oE '(perftest$|perftest[[:space:]].+$)')" \
- || true
+ comment="${GERRIT_EVENT_COMMENT_TEXT}"
+ # As "perftest" can be followed by something, we substitute it.
+ comment="${comment/perftest-2n/perftest}"
+ comment="${comment/perftest-3n/perftest}"
+ comment="${comment/perftest-hsw/perftest}"
+ comment="${comment/perftest-skx/perftest}"
+ tag_string="$(echo "${comment}" \
+ | grep -oE '(perftest$|perftest[[:space:]].+$)' || true)"
# Set test tags as string.
- TEST_TAG_STRING="${trigger#$"perftest"}"
+ TEST_TAG_STRING="${tag_string#$"perftest"}"
;;
*)
die "Unknown specification: ${TEST_CODE}"
test_tag_array=("ndrpdrAND64bAND1c"
"ndrpdrAND78bAND1c")
;;
- *"mrr-daily"* | *"mrr-weekly"* )
+ *"mrr-daily"* )
test_tag_array=(# vic
"mrrANDnic_cisco-vic-1227AND64b"
"mrrANDnic_cisco-vic-1385AND64b"
# vm vhost ip4 base
"mrrANDvhostANDip4fwdANDbaseAND64b"
"mrrANDvhostANDip4fwdANDbaseANDimix"
+ # DPDK
+ "mrrANDdpdkAND64b"
# 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
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"