diff options
Diffstat (limited to 'resources/libraries')
| -rw-r--r-- | resources/libraries/bash/function/common.sh | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 0190d6bbb6..751ee2f8dd 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -468,14 +468,6 @@ function get_test_code () { NODENESS="3n" FLAVOR="aws" ;; - *"2n-c6gn") - NODENESS="2n" - FLAVOR="c6gn" - ;; - *"3n-c6gn") - NODENESS="3n" - FLAVOR="c6gn" - ;; *"2n-c7gn") NODENESS="2n" FLAVOR="c7gn" @@ -710,15 +702,6 @@ function prepare_topology () { } terraform_apply || die "Failed to call terraform apply." ;; - "2n_c6gn" | "3n_c6gn") - export TF_VAR_testbed_name="${TEST_CODE}" - TERRAFORM_MODULE_DIR="terraform-aws-${NODENESS}-c6gn" - terraform_init || die "Failed to call terraform init." - trap "terraform_destroy" ERR EXIT || { - die "Trap attempt failed, please cleanup manually. Aborting!" - } - terraform_apply || die "Failed to call terraform apply." - ;; "2n_c7gn" | "3n_c7gn") export TF_VAR_testbed_name="${TEST_CODE}" TERRAFORM_MODULE_DIR="terraform-aws-${NODENESS}-c7gn" @@ -985,9 +968,6 @@ function select_tags () { *"1n-aws" | *"2n-aws" | *"3n-aws") default_nic="nic_amazon-nitro-50g" ;; - *"2n-c6gn" | *"3n-c6gn") - default_nic="nic_amazon-nitro-100g" - ;; *"2n-c7gn" | *"3n-c7gn") default_nic="nic_amazon-nitro-100g" ;; @@ -1145,9 +1125,6 @@ function select_tags () { *"1n-aws" | *"2n-aws" | *"3n-aws") test_tag_array+=("!ipsechw") ;; - *"2n-c6gn" | *"3n-c6gn") - test_tag_array+=("!ipsechw") - ;; *"2n-c7gn" | *"3n-c7gn") test_tag_array+=("!ipsechw") ;; @@ -1234,10 +1211,6 @@ function select_topology () { TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n-aws*.yaml ) TOPOLOGIES_TAGS="2_node_single_link_topo" ;; - "2n_c6gn") - TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n-c6gn*.yaml ) - TOPOLOGIES_TAGS="2_node_single_link_topo" - ;; "2n_c7gn") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n-c7gn*.yaml ) TOPOLOGIES_TAGS="2_node_single_link_topo" @@ -1274,10 +1247,6 @@ function select_topology () { TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n-aws*.yaml ) TOPOLOGIES_TAGS="3_node_single_link_topo" ;; - "3n_c6gn") - TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n-c6gn*.yaml ) - TOPOLOGIES_TAGS="3_node_single_link_topo" - ;; "3n_c7gn") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n-c7gn*.yaml ) TOPOLOGIES_TAGS="3_node_single_link_topo" @@ -1346,13 +1315,6 @@ function set_environment_variables () { # Settings to prevent duration stretching. export PERF_TRIAL_STL_DELAY=0.1 ;; - *"2n-c6gn" | *"3n-c6gn") - 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 - ;; *"2n-c7gn" | *"3n-c7gn") export TREX_RX_DESCRIPTORS_COUNT=1024 export TREX_EXTRA_CMDLINE="--mbuf-factor 19" @@ -1414,10 +1376,6 @@ function untrap_and_unreserve_testbed () { TERRAFORM_MODULE_DIR="terraform-aws-${NODENESS}-${FLAVOR}-c5n" terraform_destroy || die "Failed to call terraform destroy." ;; - *"2n-c6gn" | *"3n-c6gn") - TERRAFORM_MODULE_DIR="terraform-aws-${NODENESS}-${FLAVOR}" - terraform_destroy || die "Failed to call terraform destroy." - ;; *"2n-c7gn" | *"3n-c7gn") TERRAFORM_MODULE_DIR="terraform-aws-${NODENESS}-${FLAVOR}" terraform_destroy || die "Failed to call terraform destroy." |