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(Terraform): Change AWS AZ
[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
ff632a2
..
7348f25
100644
(file)
--- a/
resources/libraries/bash/function/common.sh
+++ b/
resources/libraries/bash/function/common.sh
@@
-606,6
+606,7
@@
function prepare_topology () {
# Prepare virtual testbed topology if needed based on flavor.
# Variables read:
# Prepare virtual testbed topology if needed based on flavor.
# Variables read:
+ # - TEST_CODE - String affecting test selection, usually jenkins job name.
# - NODENESS - Node multiplicity of testbed, either "2n" or "3n".
# - FLAVOR - Node flavor string, e.g. "clx" or "skx".
# Functions called:
# - NODENESS - Node multiplicity of testbed, either "2n" or "3n".
# - FLAVOR - Node flavor string, e.g. "clx" or "skx".
# Functions called:
@@
-618,10
+619,12
@@
function prepare_topology () {
case_text="${NODENESS}_${FLAVOR}"
case "${case_text}" in
"2n_aws")
case_text="${NODENESS}_${FLAVOR}"
case "${case_text}" in
"2n_aws")
+ export TF_VAR_testbed_name="${TEST_CODE}"
terraform_init || die "Failed to call terraform init."
terraform_apply || die "Failed to call terraform apply."
;;
"3n_aws")
terraform_init || die "Failed to call terraform init."
terraform_apply || die "Failed to call terraform apply."
;;
"3n_aws")
+ export TF_VAR_testbed_name="${TEST_CODE}"
terraform_init || die "Failed to call terraform init."
terraform_apply || die "Failed to call terraform apply."
;;
terraform_init || die "Failed to call terraform init."
terraform_apply || die "Failed to call terraform apply."
;;
@@
-858,7
+861,9
@@
function select_tags () {
awk_nics_sub_cmd+='else if ($9 =="drv_rdma_core") drv ="rdma-";'
awk_nics_sub_cmd+='else if ($9 =="drv_af_xdp") drv ="af-xdp-";'
awk_nics_sub_cmd+='else drv="";'
awk_nics_sub_cmd+='else if ($9 =="drv_rdma_core") drv ="rdma-";'
awk_nics_sub_cmd+='else if ($9 =="drv_af_xdp") drv ="af-xdp-";'
awk_nics_sub_cmd+='else drv="";'
- awk_nics_sub_cmd+='print "*"$7"-" drv $11"-"$5"."$3"-"$1"-" drv $11"-"$5'
+ awk_nics_sub_cmd+='if ($1 =="-") cores="";'
+ awk_nics_sub_cmd+='else cores=$1;'
+ awk_nics_sub_cmd+='print "*"$7"-" drv $11"-"$5"."$3"-" cores "-" drv $11"-"$5'
# Tag file directory shorthand.
tfd="${JOB_SPECS_DIR}"
# Tag file directory shorthand.
tfd="${JOB_SPECS_DIR}"
@@
-931,6
+936,10
@@
function select_tags () {
*"1n-vbox"*)
test_tag_array+=("!avf")
test_tag_array+=("!vhost")
*"1n-vbox"*)
test_tag_array+=("!avf")
test_tag_array+=("!vhost")
+ test_tag_array+=("!flow")
+ ;;
+ *"1n_tx2"*)
+ test_tag_array+=("!flow")
;;
*"2n-skx"*)
test_tag_array+=("!ipsechw")
;;
*"2n-skx"*)
test_tag_array+=("!ipsechw")
@@
-1113,6
+1122,7
@@
function set_environment_variables () {
# T-Rex 2.88 workaround for ENA NICs
export TREX_RX_DESCRIPTORS_COUNT=1024
export TREX_EXTRA_CMDLINE="--mbuf-factor 19"
# 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
export PERF_TRIAL_STL_DELAY=0.1
;;
# Settings to prevent duration stretching
export PERF_TRIAL_STL_DELAY=0.1
;;