feat(infra): Add Mellanox CX6 to 3n-icx

[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 d768e9b..c9845c1 100644 (file)
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -656,7 +656,7 @@ function prepare_topology () {
             export TF_VAR_testbed_name="${TEST_CODE}"
             TERRAFORM_MODULE_DIR="terraform-aws-${NODENESS}-${FLAVOR}-c5n"
             terraform_init || die "Failed to call terraform init."
-            trap 'terraform_destroy' ERR || {
+            trap "terraform_destroy" ERR EXIT || {
                 die "Trap attempt failed, please cleanup manually. Aborting!"
             }
             terraform_apply || die "Failed to call terraform apply."
@@ -867,7 +867,7 @@ function select_tags () {
             default_nic="nic_intel-x520-da2"
             ;;
         *"3n-icx"* | *"2n-icx"*)
-            default_nic="nic_intel-xxv710"
+            default_nic="nic_intel-e810cq"
             ;;
         *"3na-spr"*)
             default_nic="nic_mellanox-cx7veat"
@@ -900,6 +900,7 @@ function select_tags () {
     awk_nics_sub_cmd+='gsub("x520-da2","10ge2p1x520");'
     awk_nics_sub_cmd+='gsub("cx556a","100ge2p1cx556a");'
     awk_nics_sub_cmd+='gsub("cx7veat","200ge2p1cx7veat");'
+    awk_nics_sub_cmd+='gsub("cx6dx","100ge2p1cx6dx");'
     awk_nics_sub_cmd+='gsub("e810cq","100ge2p1e810cq");'
     awk_nics_sub_cmd+='gsub("vic1227","10ge2p1vic1227");'
     awk_nics_sub_cmd+='gsub("vic1385","40ge2p1vic1385");'