X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fcommon.sh;h=7b9cb1cf9582df459360c30b48bfe7a4bcf8e16f;hp=fa57071003c461a514e3259c8364c3b8425cdd16;hb=eea1611300a7e80694173b0c448865a772746434;hpb=9153649f4d6a56821be494fe02d5cd6faa11ebc2 diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index fa57071003..7b9cb1cf95 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -495,6 +495,10 @@ function get_test_code () { NODENESS="3n" FLAVOR="tsh" ;; + *"3n-alt"*) + NODENESS="3n" + FLAVOR="alt" + ;; esac } @@ -884,7 +888,7 @@ function select_tags () { *"3n-skx"* | *"2n-skx"* | *"2n-clx"* | *"2n-zn2"*) default_nic="nic_intel-xxv710" ;; - *"2n-tx2"* | *"mrr-daily-master") + *"2n-tx2"* | *"3n-alt"* | *"mrr-daily-master") default_nic="nic_intel-xl710" ;; *"1n-aws"* | *"2n-aws"* | *"3n-aws"*) @@ -1020,7 +1024,7 @@ function select_tags () { test_tag_array+=("!vts") test_tag_array+=("!drv_avf") ;; - *"2n-tx2"*) + *"2n-tx2"* | *"3n-alt"*) test_tag_array+=("!ipsechw") ;; *"3n-dnv"*) @@ -1150,6 +1154,10 @@ function select_topology () { TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_tx2*.yaml ) TOPOLOGIES_TAGS="2_node_single_link_topo" ;; + "3n_alt") + TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_alt*.yaml ) + TOPOLOGIES_TAGS="3_node_single_link_topo" + ;; "1n_aws") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*1n-aws*.yaml ) TOPOLOGIES_TAGS="1_node_single_link_topo" @@ -1188,13 +1196,16 @@ function set_environment_variables () { case "${TEST_CODE}" in *"1n-aws"* | *"2n-aws"* | *"3n-aws"*) - # T-Rex 2.88 workaround for ENA NICs + # T-Rex 2.88+ workaround for ENA NICs. export TREX_RX_DESCRIPTORS_COUNT=1024 export TREX_EXTRA_CMDLINE="--mbuf-factor 19" export TREX_CORE_COUNT=6 - # Settings to prevent duration stretching + # Settings to prevent duration stretching. export PERF_TRIAL_STL_DELAY=0.1 ;; + *"2n-zn2"*) + # Maciek's workaround for Zen2 with lower amount of cores. + export TREX_CORE_COUNT=14 esac }