X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fcommon.sh;h=5982af9427635684f749f03a40c5bd29434a6d45;hb=1c108d51c08631548dc2b2ba1b7652e0b577d82c;hp=db3d86592ef10e0f826f7bd2968aa26015e26e18;hpb=15c227fd0a94bfcdb4617473f9e23899995c2bdd;p=csit.git diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index db3d86592e..5982af9427 100644 --- 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") ;; - *"mrr-daily"* | *"mrr-weekly"* ) + *"mrr-daily"* ) 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" + # 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 @@ -780,7 +790,7 @@ function select_topology () { 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"