feat(job_specs): 2n-c7gn

Signed-off-by: Peter Mikus <peter.mikus@protonmail.ch>
Change-Id: Idca0738320b56196e98aeec3050312111a90609a

diff --git a/resources/job_specs/mrr_weekly/vpp-2n-c7gn.md b/resources/job_specs/mrr_weekly/vpp-2n-c7gn.md
new file mode 120000 (symlink)
index 0000000..274f15c
--- /dev/null
+++ b/resources/job_specs/mrr_weekly/vpp-2n-c7gn.md
@@ -0,0 +1 @@
+../report_iterative/2n-c7gn/vpp-mrr-00.md
\ No newline at end of file

diff --git a/resources/job_specs/mrr_weekly/vpp-3n-c7gn.md b/resources/job_specs/mrr_weekly/vpp-3n-c7gn.md
new file mode 120000 (symlink)
index 0000000..777b65f
--- /dev/null
+++ b/resources/job_specs/mrr_weekly/vpp-3n-c7gn.md
@@ -0,0 +1 @@
+../report_iterative/3n-c7gn/vpp-mrr-00.md
\ No newline at end of file

diff --git a/resources/job_specs/ndrpdr_weekly/vpp-2n-c7gn.md b/resources/job_specs/ndrpdr_weekly/vpp-2n-c7gn.md
new file mode 120000 (symlink)
index 0000000..d2acc82
--- /dev/null
+++ b/resources/job_specs/ndrpdr_weekly/vpp-2n-c7gn.md
@@ -0,0 +1 @@
+../report_iterative/2n-c7gn/vpp-ndrpdr-00.md
\ No newline at end of file

diff --git a/resources/job_specs/ndrpdr_weekly/vpp-3n-c7gn.md b/resources/job_specs/ndrpdr_weekly/vpp-3n-c7gn.md
new file mode 120000 (symlink)
index 0000000..3491794
--- /dev/null
+++ b/resources/job_specs/ndrpdr_weekly/vpp-3n-c7gn.md
@@ -0,0 +1 @@
+../report_iterative/3n-c7gn/vpp-ndrpdr-00.md
\ No newline at end of file

diff --git a/resources/job_specs/report_coverage/2n-c7gn/vpp-00.md b/resources/job_specs/report_coverage/2n-c7gn/vpp-00.md
new file mode 100644 (file)
index 0000000..27f15d6
--- /dev/null
+++ b/resources/job_specs/report_coverage/2n-c7gn/vpp-00.md
@@ -0,0 +1,37 @@
+# 2n-c7gn
+## ./ip4
+### Amazon-Nitro-100G
+#### dpdk-vfio-pci
+##### ethip4-ip4base
+1c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+2c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+##### ethip4-ip4scale20k
+1c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+2c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+##### ethip4-ip4scale20k-rnd
+1c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+2c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+## ./ip6
+### Amazon-Nitro-100G
+#### dpdk-vfio-pci
+##### ethip6-ip6base
+1c AND 78b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6base
+2c AND 78b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6base
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6base
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6base
+##### ethip6-ip6scale20k
+1c AND 78b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k
+2c AND 78b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k
+##### ethip6-ip6scale20k-rnd
+1c AND 78b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k-rnd
+2c AND 78b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k-rnd
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k-rnd
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k-rnd

diff --git a/resources/job_specs/report_coverage/3n-c7gn/vpp-00.md b/resources/job_specs/report_coverage/3n-c7gn/vpp-00.md
new file mode 100644 (file)
index 0000000..9925139
--- /dev/null
+++ b/resources/job_specs/report_coverage/3n-c7gn/vpp-00.md
@@ -0,0 +1,27 @@
+# 3n-c7gn
+## ./crypto
+### Amazon-Nitro-100G
+#### dpdk-vfio-pci
+##### ethip4ipsec40tnlsw-ip4base-int-aes256gcm
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-int-aes256gcm
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-int-aes256gcm
+1c AND imix AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-int-aes256gcm
+2c AND imix AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-int-aes256gcm
+## ./ip4
+### Amazon-Nitro-100G
+#### dpdk-vfio-pci
+##### ethip4-ip4base
+1c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+2c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+##### ethip4-ip4scale20k
+1c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+2c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+##### ethip4-ip4scale20k-rnd
+1c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+2c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd

diff --git a/resources/job_specs/report_iterative/2n-c7gn/vpp-mrr-00.md b/resources/job_specs/report_iterative/2n-c7gn/vpp-mrr-00.md
new file mode 100644 (file)
index 0000000..6b23f87
--- /dev/null
+++ b/resources/job_specs/report_iterative/2n-c7gn/vpp-mrr-00.md
@@ -0,0 +1,37 @@
+# 2n-c7gn
+## ./ip4
+### Amazon-Nitro-100G
+#### dpdk-vfio-pci
+##### ethip4-ip4base
+1c AND 64b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+2c AND 64b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+1c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+2c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+##### ethip4-ip4scale20k
+1c AND 64b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+2c AND 64b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+1c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+2c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+##### ethip4-ip4scale20k-rnd
+1c AND 64b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+2c AND 64b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+1c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+2c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+## ./ip6
+### Amazon-Nitro-100G
+#### dpdk-vfio-pci
+##### ethip6-ip6base
+1c AND 78b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6base
+2c AND 78b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6base
+1c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6base
+2c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6base
+##### ethip6-ip6scale20k
+1c AND 78b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k
+2c AND 78b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k
+1c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k
+2c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k
+##### ethip6-ip6scale20k-rnd
+1c AND 78b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k-rnd
+2c AND 78b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k-rnd
+1c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k-rnd
+2c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k-rnd

diff --git a/resources/job_specs/report_iterative/2n-c7gn/vpp-ndrpdr-00.md b/resources/job_specs/report_iterative/2n-c7gn/vpp-ndrpdr-00.md
new file mode 100644 (file)
index 0000000..27f15d6
--- /dev/null
+++ b/resources/job_specs/report_iterative/2n-c7gn/vpp-ndrpdr-00.md
@@ -0,0 +1,37 @@
+# 2n-c7gn
+## ./ip4
+### Amazon-Nitro-100G
+#### dpdk-vfio-pci
+##### ethip4-ip4base
+1c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+2c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+##### ethip4-ip4scale20k
+1c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+2c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+##### ethip4-ip4scale20k-rnd
+1c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+2c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+## ./ip6
+### Amazon-Nitro-100G
+#### dpdk-vfio-pci
+##### ethip6-ip6base
+1c AND 78b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6base
+2c AND 78b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6base
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6base
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6base
+##### ethip6-ip6scale20k
+1c AND 78b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k
+2c AND 78b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k
+##### ethip6-ip6scale20k-rnd
+1c AND 78b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k-rnd
+2c AND 78b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k-rnd
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k-rnd
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip6-ip6scale20k-rnd

diff --git a/resources/job_specs/report_iterative/3n-c7gn/vpp-mrr-00.md b/resources/job_specs/report_iterative/3n-c7gn/vpp-mrr-00.md
new file mode 100644 (file)
index 0000000..308fdca
--- /dev/null
+++ b/resources/job_specs/report_iterative/3n-c7gn/vpp-mrr-00.md
@@ -0,0 +1,27 @@
+# 3n-c7gn
+## ./crypto
+### Amazon-Nitro-100G
+#### dpdk-vfio-pci
+##### ethip4ipsec40tnlsw-ip4base-int-aes256gcm
+1c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-int-aes256gcm
+2c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-int-aes256gcm
+1c AND imix AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-int-aes256gcm
+2c AND imix AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-int-aes256gcm
+## ./ip4
+### Amazon-Nitro-100G
+#### dpdk-vfio-pci
+##### ethip4-ip4base
+1c AND 64b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+2c AND 64b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+1c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+2c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+##### ethip4-ip4scale20k
+1c AND 64b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+2c AND 64b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+1c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+2c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+##### ethip4-ip4scale20k-rnd
+1c AND 64b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+2c AND 64b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+1c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+2c AND 1518b AND mrr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd

diff --git a/resources/job_specs/report_iterative/3n-c7gn/vpp-ndrpdr-00.md b/resources/job_specs/report_iterative/3n-c7gn/vpp-ndrpdr-00.md
new file mode 100644 (file)
index 0000000..9925139
--- /dev/null
+++ b/resources/job_specs/report_iterative/3n-c7gn/vpp-ndrpdr-00.md
@@ -0,0 +1,27 @@
+# 3n-c7gn
+## ./crypto
+### Amazon-Nitro-100G
+#### dpdk-vfio-pci
+##### ethip4ipsec40tnlsw-ip4base-int-aes256gcm
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-int-aes256gcm
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-int-aes256gcm
+1c AND imix AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-int-aes256gcm
+2c AND imix AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4ipsec40tnlsw-ip4base-int-aes256gcm
+## ./ip4
+### Amazon-Nitro-100G
+#### dpdk-vfio-pci
+##### ethip4-ip4base
+1c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+2c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4base
+##### ethip4-ip4scale20k
+1c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+2c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k
+##### ethip4-ip4scale20k-rnd
+1c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+2c AND 64b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+1c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd
+2c AND 1518b AND ndrpdr AND nitro-100g AND drv_vfio_pci AND ethip4-ip4scale20k-rnd

diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index 0190d6b..751ee2f 100644 (file)
--- 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."