aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorpmikus <pmikus@cisco.com>2021-10-18 12:44:59 +0000
committerPeter Mikus <pmikus@cisco.com>2021-10-20 14:53:46 +0000
commitaff4d46c7ad0f54c4be632d498bf88a75d22e70e (patch)
tree974d30919e997f58a962152cda937bb751a775c4 /resources
parent2f734f4ca633bd875066891caf39a28537321460 (diff)
fix(Terraform): Change AWS AZ
Signed-off-by: pmikus <pmikus@cisco.com> Change-Id: I19c160e40e01bd7f69c08188f61d2bcbc3fd4bcb (cherry picked from commit 8be983ad917cd47fa8da4256fa8ada14ecfcd425)
Diffstat (limited to 'resources')
-rw-r--r--resources/libraries/bash/function/common.sh1
-rw-r--r--resources/libraries/bash/function/terraform.sh3
2 files changed, 4 insertions, 0 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index 510ccb0072..7348f25c47 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -1122,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"
+ export TREX_CORE_COUNT=6
# Settings to prevent duration stretching
export PERF_TRIAL_STL_DELAY=0.1
;;
diff --git a/resources/libraries/bash/function/terraform.sh b/resources/libraries/bash/function/terraform.sh
index 5313b62545..ed3bda32aa 100644
--- a/resources/libraries/bash/function/terraform.sh
+++ b/resources/libraries/bash/function/terraform.sh
@@ -34,6 +34,9 @@ function terraform_apply () {
pushd "${CSIT_DIR}"/fdio.infra.terraform || die "Pushd failed!"
pushd "${NODENESS}_${FLAVOR}_c5n" || die "Pushd failed!"
export TF_LOG=INFO
+ trap 'terraform_destroy' ERR || {
+ die "Trap attempt failed, please cleanup manually. Aborting!"
+ }
terraform apply -no-color -auto-approve || die "Terraform apply failed!"
popd || die "Popd failed!"
popd || die "Popd failed!"