2n-zn2 Epyc backport

- Better to get it fully aligned then cherry-pick spaghetti.

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: If223ef3f0247413d53225eb57f8903a7675632e3

56 files changed, 763 insertions, 53 deletions

diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index 8e0ee97be1..a144b3cc3a 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -145,7 +145,7 @@ function archive_tests () {
 
     set -exuo pipefail
 
-    tar c "${GENERATED_DIR}/tests" | xz -9e > "${ARCHIVE_DIR}/tests.tar.xz" || {
+    tar c "${GENERATED_DIR}/tests" | xz -3 > "${ARCHIVE_DIR}/tests.tar.xz" || {
         die "Error creating archive of generated tests."
     }
 }
@@ -460,6 +460,10 @@ function get_test_code () {
             NODENESS="2n"
             FLAVOR="skx"
             ;;
+        *"2n-zn2"*)
+            NODENESS="2n"
+            FLAVOR="zn2"
+            ;;
         *"3n-skx"*)
             NODENESS="3n"
             FLAVOR="skx"
@@ -756,7 +760,7 @@ function select_tags () {
         *"3n-tsh"*)
             default_nic="nic_intel-x520-da2"
             ;;
-        *"3n-skx"* | *"2n-skx"* | *"2n-clx"*)
+        *"3n-skx"* | *"2n-skx"* | *"2n-clx"* | *"2n-zn2"*)
             default_nic="nic_intel-xxv710"
             ;;
         *"3n-hsw"* | *"mrr-daily-master")
@@ -834,7 +838,7 @@ function select_tags () {
     # TODO: Add missing reasons here (if general) or where used (if specific).
     case "${TEST_CODE}" in
         *"2n-skx"*)
-            test_tag_array+=("!ipsechw")
+            test_tag_array+=("!ipsec")
             ;;
         *"3n-skx"*)
             test_tag_array+=("!ipsechw")
@@ -842,7 +846,10 @@ function select_tags () {
             test_tag_array+=("!3_node_double_link_topoANDnic_intel-xxv710")
             ;;
         *"2n-clx"*)
-            test_tag_array+=("!ipsechw")
+            test_tag_array+=("!ipsec")
+            ;;
+        *"2n-zn2"*)
+            test_tag_array+=("!ipsec")
             ;;
         *"2n-dnv"*)
             test_tag_array+=("!ipsechw")
@@ -865,10 +872,6 @@ function select_tags () {
             test_tag_array+=("!ipsechw")
             ;;
         *"3n-hsw"*)
-            # TODO: Introduce NOIOMMU version of AVF tests.
-            # TODO: Make (both) AVF tests work on Haswell,
-            # or document why (some of) it is not possible.
-            # https://github.com/FDio/vpp/blob/master/src/plugins/avf/README.md
             test_tag_array+=("!drv_avf")
             # All cards have access to QAT. But only one card (xl710)
             # resides in same NUMA as QAT. Other cards must go over QPI
@@ -958,6 +961,10 @@ function select_topology () {
             TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_skx*.yaml )
             TOPOLOGIES_TAGS="2_node_*_link_topo"
             ;;
+        "2n_zn2")
+            TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_zn2*.yaml )
+            TOPOLOGIES_TAGS="2_node_*_link_topo"
+            ;;
         "3n_skx")
             TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_skx*.yaml )
             TOPOLOGIES_TAGS="3_node_*_link_topo"
diff --git a/resources/libraries/python/TrafficGenerator.py b/resources/libraries/python/TrafficGenerator.py
index cd100da028..23337b2848 100644
--- a/resources/libraries/python/TrafficGenerator.py
+++ b/resources/libraries/python/TrafficGenerator.py
@@ -247,7 +247,6 @@ class TrafficGenerator(AbstractMeasurer):
         )
 
     # TODO: pylint says disable=too-many-locals.
-    # A fix is developed in https://gerrit.fd.io/r/c/csit/+/22221
     def initialize_traffic_generator(
             self, tg_node, tg_if1, tg_if2, tg_if1_adj_node, tg_if1_adj_if,
             tg_if2_adj_node, tg_if2_adj_if, osi_layer, tg_if1_dst_mac=None,
@@ -372,7 +371,8 @@ class TrafficGenerator(AbstractMeasurer):
                 # Configure TRex.
                 ports = ''
                 for port in tg_node[u"interfaces"].values():
-                    ports += f" {port.get(u'pci_address')}"
+                    if u'Mellanox' not in port.get(u'model'):
+                        ports += f" {port.get(u'pci_address')}"
 
                 cmd = f"sh -c \"cd {Constants.TREX_INSTALL_DIR}/scripts/ && " \
                     f"./dpdk_nic_bind.py -u {ports} || true\""
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml
index 55dee36edc..660e33ee53 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.16.yaml
@@ -3,9 +3,21 @@
 
 hostname: "t1-tg1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-17,19-35"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml
index 9159af66e4..48e5083332 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.17.yaml
@@ -3,9 +3,21 @@
 
 hostname: "t1-sut1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-17,19-35"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml
index cda286675f..f823ed6406 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.18.yaml
@@ -3,9 +3,21 @@
 
 hostname: "t1-sut2"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-17,19-35"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml
index 6df8fd1970..68af6e81f7 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.20.yaml
@@ -3,9 +3,21 @@
 
 hostname: "t2-tg1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-17,19-35"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml
index daa0eb14ce..0d43874ae3 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.21.yaml
@@ -3,9 +3,21 @@
 
 hostname: "t2-sut1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-17,19-35"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml
index 49945304b6..797606a353 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.22.yaml
@@ -3,9 +3,21 @@
 
 hostname: "t2-sut2"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-17,19-35"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml
index e8c7e98267..25bb536f81 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.24.yaml
@@ -3,9 +3,21 @@
 
 hostname: "t3-tg1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-17,19-35"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml
index e102a55631..db02aa7816 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.25.yaml
@@ -3,9 +3,21 @@
 
 hostname: "t3-sut1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-17,19-35"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml
index 7cfae3635e..0e97bd0fd2 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.26.yaml
@@ -3,9 +3,21 @@
 
 hostname: "t3-sut2"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-17,19-35"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-17,19-35"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-17,19-35"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,18"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml
index 3469427eac..cb15cadfa3 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml
@@ -3,8 +3,13 @@
 
 hostname: "s17-t33-sut1"
 grub:
+  audit: "0"
+  intel_iommu: "on"
   isolcpus: "1-15,17-31,33-47,49-63"
+  nmi_watchdog: "0"
   nohz_full: "1-15,17-31,33-47,49-63"
+  nosoftlockup: True
+  processor.max_cstate: "1"
   rcu_nocbs: "1-15,17-31,33-47,49-63"
 sysctl:
   kernel:
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml
index 64a56a8ebb..90a3d4ffc3 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml
@@ -3,8 +3,13 @@
 
 hostname: "s18-t33-sut2"
 grub:
+  audit: "0"
+  intel_iommu: "on"
   isolcpus: "1-15,17-31,33-47,49-63"
+  nmi_watchdog: "0"
   nohz_full: "1-15,17-31,33-47,49-63"
+  nosoftlockup: True
+  processor.max_cstate: "1"
   rcu_nocbs: "1-15,17-31,33-47,49-63"
 sysctl:
   kernel:
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml
index d84043903e..2b06831186 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.44.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s3-t21-sut1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml
index be5e1c686d..9818f826c9 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.45.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s4-t21-tg1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml
index fff2a68bac..24be5e2e54 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.46.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s11-t31-sut1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml
index 5ed6a9c6b6..7b59ff1606 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.47.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s12-t31-sut2"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml
index 3f13d1431a..d69fd03edc 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.48.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s13-t31-tg1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml
index 629044d0bc..62ef6da2ce 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s19-t33t34-tg1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
index 0904fca6de..20dc7a5880 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.50.yaml
@@ -3,8 +3,8 @@
 
 hostname: "s1-t11-sut1"
 grub:
+  hugepagesz: "2M"
   nr_hugepages: 65536
-
 inventory_ipmi_hostname: "10.30.50.47"
 cpu_microarchitecture: "skylake"
 
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
index f003f0d84d..f518fa5704 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.51.yaml
@@ -3,8 +3,8 @@
 
 hostname: "s2-t12-sut1"
 grub:
+  hugepagesz: "2M"
   nr_hugepages: 65536
-
 inventory_ipmi_hostname: "10.30.50.48"
 cpu_microarchitecture: "skylake"
 
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
index 2522ecb5f7..4a4ccc0d91 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.52.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s5-t22-sut1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
index 05a38626f9..f0a50bfb71 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.53.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s6-t22-tg1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
index cde66d0bb2..b51eed468f 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.54.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s7-t23-sut1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
index bd45f3ad43..4b144fa69b 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.55.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s8-t23-tg1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
index f16e3dcdbf..613c9b110c 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.56.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s9-t24-sut1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
index d36d47f97a..52ec3d9911 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.57.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s10-t24-tg1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
index ab9f66616f..8971b4a7bb 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.58.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s14-t32-sut1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
index 8e5c583f38..ed39581e30 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.59.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s15-t32-sut2"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml
index e68ae5beda..1e3a49cf1d 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.60.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s16-t32-tg1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml
index dfbe5a876b..221bc3afb5 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml
@@ -3,15 +3,20 @@
 
 hostname: "s27-t13-sut1"
 grub:
+  audit: "0"
+  intel_iommu: "on"
   isolcpus: "1-111,113-223"
+  nmi_watchdog: "0"
   nohz_full: "1-111,113-223"
+  nosoftlockup: True
+  processor.max_cstate: "1"
   rcu_nocbs: "1-111,113-223"
 sysctl:
   kernel:
-  watchdog_cpumask: "0,112"
+    watchdog_cpumask: "0,112"
   vm:
-  nr_hugepages: 57344
-  max_map_count: 20000
+    nr_hugepages: 57344
+    max_map_count: 20000
 
 inventory_ipmi_hostname: "10.30.50.69"
 cpu_microarchitecture: "thunderx2"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
index da603c28ce..b7d2d15cf8 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.70.yaml
@@ -5,6 +5,7 @@ hostname: "s55-t36-sut1"
 inventory_ipmi_hostname: "10.30.50.70"
 vfs_data_file: "csit-initialize-vfs-tx2.sh"
 grub:
+  hugepagesz: "2M"
   nr_hugepages: 65536
 cpu_microarchitecture: "thunderx2"
 
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
index b5fb9cc4ec..a6cc611d73 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.71.yaml
@@ -5,6 +5,7 @@ hostname: "s56-t37-sut1"
 inventory_ipmi_hostname: "10.30.50.71"
 vfs_data_file: "csit-initialize-vfs-tx2.sh"
 grub:
+  hugepagesz: "2M"
   nr_hugepages: 65536
 cpu_microarchitecture: "thunderx2"
 
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.10.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.10.yaml
index 7f7860b5f3..05f1a19576 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.10.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.10.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s28-t26t35-tg1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.11.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.11.yaml
index 0ada8f08e3..c6cb68cb5d 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.11.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.11.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s29-t26-sut1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-5"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-5"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-5"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.12.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.12.yaml
index 4e9302314a..5d350647a9 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.12.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.12.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s30-t35-sut1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-5"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-5"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-5"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.13.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.13.yaml
index 9cd28df16b..aff600265c 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.13.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.13.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s31-t35-sut2"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-5"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-5"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-5"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml
index 63b3dde611..6fe0dbc14d 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.18.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s33-t27-sut1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-23,25-47,49-71,73-95"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-23,25-47,49-71,73-95"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-23,25-47,49-71,73-95"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,24,48,72"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml
index 1b1b76957d..f963d4b888 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.19.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s34-t27-tg1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml
index f1b2b414c5..6913550686 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.20.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s35-t28-sut1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-23,25-47,49-71,73-95"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-23,25-47,49-71,73-95"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-23,25-47,49-71,73-95"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,24,48,72"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml
index 66febe13a8..98cffb3392 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.21.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s36-t28-tg1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml
index ef3d3455f6..f58b2ce07d 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.22.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s37-t29-sut1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-23,25-47,49-71,73-95"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-23,25-47,49-71,73-95"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-23,25-47,49-71,73-95"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,24,48,72"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml
index 2430f612b8..364ab8b295 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.23.yaml
@@ -3,9 +3,21 @@
 
 hostname: "s38-t29-tg1"
 grub:
+  audit: "0"
+  hpet: "disable"
+  intel_idle.max_cstate: "1"
+  intel_iommu: "on"
+  intel_pstate: "disable"
+  iommu: "pt"
   isolcpus: "1-27,29-55,57-83,85-111"
+  mce: "off"
+  nmi_watchdog: "0"
   nohz_full: "1-27,29-55,57-83,85-111"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "1"
   rcu_nocbs: "1-27,29-55,57-83,85-111"
+  tsc: "reliable"
 sysctl:
   kernel:
     watchdog_cpumask: "0,28,56,84"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml
new file mode 100644
index 0000000000..dc8a060cc0
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml
@@ -0,0 +1,26 @@
+---
+# file: host_vars/10.32.8.24.yaml
+
+hostname: "s60-t210-sut1"
+grub:
+  amd_iommu: "on"
+  audit: "0"
+  hpet: "disable"
+  iommu: "pt"
+  isolcpus: "1-15,17-31,33-47,49-63"
+  nmi_watchdog: "0"
+  nohz_full: "off"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "0"
+  rcu_nocbs: "1-15,17-31,33-47,49-63"
+  tsc: "reliable"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,16,32,48"
+  vm:
+    nr_hugepages: 8192
+    max_map_count: 20000
+
+inventory_ipmi_hostname: "10.30.55.24"
+cpu_microarchitecture: "epyc"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml
new file mode 100644
index 0000000000..8c99bf3cae
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml
@@ -0,0 +1,26 @@
+---
+# file: host_vars/10.32.8.25.yaml
+
+hostname: "s61-t210-tg1"
+grub:
+  amd_iommu: "on"
+  audit: "0"
+  hpet: "disable"
+  iommu: "pt"
+  isolcpus: "1-15,17-31,33-47,49-63"
+  nmi_watchdog: "0"
+  nohz_full: "off"
+  nosoftlockup: True
+  numa_balancing: "disable"
+  processor.max_cstate: "0"
+  rcu_nocbs: "1-15,17-31,33-47,49-63"
+  tsc: "reliable"
+sysctl:
+  kernel:
+    watchdog_cpumask: "0,16,32,48"
+  vm:
+    nr_hugepages: 8192
+    max_map_count: 20000
+
+inventory_ipmi_hostname: "10.30.55.25"
+cpu_microarchitecture: "epyc"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts
index ac1c46eb65..4f13457dd7 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts
@@ -16,6 +16,7 @@ all:
         10.32.8.19: #s34-t27-tg1 - cascadelake
         10.32.8.21: #s36-t28-tg1 - cascadelake
         10.32.8.23: #s38-t29-tg1 - cascadelake
+        10.32.8.25: #s61-t210-tg1 - epyc
     sut:
       hosts:
         10.30.51.17: #t1-sut1 - haswell
@@ -40,6 +41,7 @@ all:
         10.32.8.18: #s33-t27-sut1 - cascadelake
         10.32.8.20: #s35-t28-sut1 - cascadelake
         10.32.8.22: #s37-t29-sut1 - cascadelake
+        10.32.8.24: #s60-t210-sut1 - epyc
         10.30.51.69: #s27-t13-sut1 - thunderx2 9975
     vpp_device:
       hosts:
diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
index e88c39c180..a6e8898f9d 100644
--- a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
@@ -1,7 +1,7 @@
 ---
 # file: roles/calibration/tasks/main.yaml
 
-- name: Calibration - Install Distribution - Release - Machine Prerequisites
+- name: Install Distribution - Release - Machine Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest
@@ -9,41 +9,42 @@
   tags:
     - install-dependencies
 
-- name: Calibration - Check CPU Power States
+- name: Check CPU Power States
   shell: "lscpu"
   register: current_lscpu
   changed_when: false
-  failed_when: |
-    'CPU min MHz' in current_lscpu.stdout and
-    'Intel(R) Xeon(R)' in current_lscpu.stdout
   tags:
     - check-cpu-frequency
 
-- name: Calibration - Check Kernel Version of "{{ kernel_version }}"
-  shell: "uname -r"
-  register: current_kernel_version
-  changed_when: false
-  failed_when: |
-    current_kernel_version.stdout not in kernel_version
+- name: Check CPU Power States
+  assert:
+    that:
+      - "'CPU min MHz' not in current_lscpu.stdout or 'Intel(R) Xeon(R)' not in ansible_processor"
+    fail_msg: "CPU configuration!"
+    success_msg: "CPU configuration match."
   tags:
-    - check-kernel-version
+    - check-cpu-frequency
 
-- name: Calibration - Check Kernel Parameters
-  shell: "cat /proc/cmdline"
-  register: current_kernel_parameters
-  changed_when: false
-  failed_when: |
-    'isolcpus' not in current_kernel_parameters.stdout or
-    'nohz_full' not in current_kernel_parameters.stdout or
-    'rcu_nocbs' not in current_kernel_parameters.stdout or
-    'processor.max_cstate=1' not in current_kernel_parameters.stdout or
-    'nmi_watchdog=0' not in current_kernel_parameters.stdout or
-    'intel_iommu=on' not in current_kernel_parameters.stdout or
-    'nosoftlockup' not in current_kernel_parameters.stdout
+- name: Check Kernel Parameters
+  assert:
+    that:
+      - item in ansible_cmdline and grub[item] == ansible_cmdline[item]
+    fail_msg: "Kernel parameters!"
+    success_msg: "Kernel parameters match."
+  loop: "{{ grub.keys()|sort }}"
   tags:
-    - check-cmdline
+    - check-kernel-params
+
+- name: Check Kernel Version
+  assert:
+    that:
+      - ansible_kernel not in kernel_version_by_distro_by_arch
+    fail_msg: "Kernel version!"
+    success_msg: "Kernel version match."
+  tags:
+    - check-kernel-version
 
-- name: Calibration - Get Spectre Meltdown Checker
+- name: Get Spectre Meltdown Checker
   get_url:
     url: "https://meltdown.ovh"
     dest: "/opt/spectre-meltdown-checker.sh"
@@ -51,7 +52,7 @@
   tags:
     - check-spectre-meltdown
 
-- name: Calibration - Run Spectre Meltdown Checker
+- name: Run Spectre Meltdown Checker
   shell: "/opt/spectre-meltdown-checker.sh --no-color || true"
   async: 60
   poll: 0
@@ -60,13 +61,13 @@
   tags:
     - check-spectre-meltdown
 
-- name: Calibration - {{ ansible_machine }} Specific
+- name: "{{ ansible_machine }} Specific"
   include_tasks: "{{ ansible_machine }}.yaml"
   tags:
     - check-machine-specific
     - check-jitter-tool
 
-- name: Check sync status
+- name: Check Sync Status
   async_status:
     jid: "{{ spectre_meltdown_async.ansible_job_id }}"
   register: "spectre_meltdown_poll_results"
diff --git a/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml
index 13db641423..5517b20e1f 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/defaults/main.yaml
@@ -19,6 +19,7 @@ packages_by_distro:
   ubuntu:
     - "build-essential"
     - "libpcap-dev"
+    - "net-tools"
     - "python-all"
     - "python-apt"
     - "python-cffi"
diff --git a/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile b/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile
new file mode 100644
index 0000000000..6dddad6ebb
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/Dockerfile
@@ -0,0 +1,173 @@
+# Copyright (c) 2020 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM ubuntu:18.04
+LABEL Description="CSIT vpp-device ubuntu 18.04 SUT image"
+LABEL Version="master"
+
+# Setup the environment
+ENV DEBIAN_FRONTEND=noninteractive
+ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
+ENV NOTVISIBLE "in users profile"
+ENV VPP_PYTHON_PREFIX=/var/cache/vpp/python
+
+# Install packages and Docker
+RUN apt-get -q update \
+ && apt-get install -y -qq \
+        # general tools
+        apt-transport-https \
+        bridge-utils \
+        cloud-init \
+        curl \
+        gdb \
+        locales \
+        net-tools \
+        openssh-server \
+        pciutils \
+        rsyslog \
+        software-properties-common \
+        ssh \
+        sudo \
+        supervisor \
+        tar \
+        vim \
+        wget \
+        # csit requirements
+        cmake \
+        dkms \
+        gfortran \
+        libblas-dev \
+        libffi-dev \
+        liblapack-dev \
+        libpcap-dev \
+        libssl-dev \
+        python-all \
+        python-apt \
+        python-cffi \
+        python-cffi-backend \
+        python-dev \
+        python-enum34 \
+        python-pip \
+        python-setuptools \
+        python-virtualenv \
+        python3-all \
+        python3-apt \
+        python3-cffi \
+        python3-cffi-backend \
+        python3-dev \
+        python3-pip \
+        python3-setuptools \
+        python3-virtualenv \
+        qemu-system \
+        socat \
+        strongswan \
+        unzip \
+        tcpdump \
+        zlib1g-dev \
+        # vpp requirements
+        ca-certificates \
+        libapr1 \
+        libmbedcrypto1 \
+        libmbedtls10 \
+        libmbedx509-0 \
+        libnuma1 \
+        sshpass \
+ && curl -L https://packagecloud.io/fdio/master/gpgkey | sudo apt-key add - \
+ && curl -s https://packagecloud.io/install/repositories/fdio/master/script.deb.sh | sudo bash \
+ # temp hack due to build.sh
+ && apt-get install -y -qq vpp-ext-deps \
+ && curl -fsSL https://get.docker.com | sh \
+ && rm -rf /var/lib/apt/lists/*
+
+# Configure locales
+RUN locale-gen en_US.UTF-8 \
+ && dpkg-reconfigure locales
+
+# Fix permissions
+RUN chown root:syslog /var/log \
+ && chmod 755 /etc/default
+
+# Create directory structure
+RUN mkdir -p /tmp/dumps \
+ && mkdir -p /var/cache/vpp/python \
+ && mkdir -p /var/run/sshd
+
+# CSIT PIP pre-cache
+RUN pip3 install \
+        ecdsa==0.13.3 \
+        paramiko==2.6.0 \
+        pycrypto==2.6.1 \
+        pypcap==1.2.3 \
+        PyYAML==5.1.1 \
+        requests==2.22.0 \
+        robotframework==3.1.2 \
+        scapy==2.4.3 \
+        scp==0.13.2 \
+        ansible==2.7.8 \
+        dill==0.2.8.2 \
+        numpy==1.17.3 \
+        hdrhistogram==0.6.1 \
+        plotly==4.1.1 \
+        PTable==0.9.2 \
+        Sphinx==2.2.1 \
+        sphinx-rtd-theme==0.4.0 \
+        sphinxcontrib-programoutput==0.15 \
+        sphinxcontrib-robotdoc==0.11.0 \
+        alabaster==0.7.12 \
+        Babel==2.7.0 \
+        bcrypt==3.1.7 \
+        certifi==2019.9.11 \
+        cffi==1.13.2 \
+        chardet==3.0.4 \
+        cryptography==2.8 \
+        docutils==0.15.2 \
+        future==0.18.2 \
+        idna==2.8 \
+        imagesize==1.1.0 \
+        Jinja2==2.10.3 \
+        MarkupSafe==1.1.1 \
+        packaging==19.2 \
+        pbr==5.4.3 \
+        pycparser==2.19 \
+        Pygments==2.4.2 \
+        PyNaCl==1.3.0 \
+        pyparsing==2.4.4 \
+        python-dateutil==2.8.1 \
+        pytz==2019.3 \
+        retrying==1.3.3 \
+        six==1.13.0 \
+        snowballstemmer==2.0.0 \
+        sphinxcontrib-applehelp==1.0.1 \
+        sphinxcontrib-devhelp==1.0.1 \
+        sphinxcontrib-htmlhelp==1.0.2 \
+        sphinxcontrib-jsmath==1.0.1 \
+        sphinxcontrib-qthelp==1.0.2 \
+        sphinxcontrib-serializinghtml==1.1.3 \
+        urllib3==1.25.6
+
+# ARM workaround
+RUN pip3 install \
+        pandas==0.25.3 \
+        scipy==1.1.0
+
+# SSH settings
+RUN echo 'root:Csit1234' | chpasswd \
+ && sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config \
+ && sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd \
+ && echo "export VISIBLE=now" >> /etc/profile
+
+EXPOSE 2222
+
+COPY supervisord.conf /etc/supervisor/supervisord.conf
+
+CMD ["sh", "-c", "rm -f /dev/shm/db /dev/shm/global_vm /dev/shm/vpe-api; /usr/bin/supervisord -c /etc/supervisor/supervisord.conf; /usr/sbin/sshd -D -p 2222"]
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/supervisord.conf b/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/supervisord.conf
new file mode 100644
index 0000000000..22a36be5c6
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/csit_sut_image/files/supervisord.conf
@@ -0,0 +1,24 @@
+[unix_http_server]
+file = /tmp/supervisor.sock
+chmod = 0777
+
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl = unix:///tmp/supervisor.sock
+
+[supervisord]
+pidfile = /tmp/supervisord.pid
+identifier = supervisor
+directory = /tmp
+logfile = /tmp/supervisord.log
+loglevel = debug
+nodaemon = false
+
+[program:vpp]
+command = /usr/bin/vpp -c /etc/vpp/startup.conf
+autostart = false
+autorestart = true
+redirect_stderr = true
+priority = 1
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/roles/csit_sut_image/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/csit_sut_image/tasks/main.yaml
new file mode 100644
index 0000000000..7b41be8a64
--- /dev/null
+++ b/resources/tools/testbed-setup/ansible/roles/csit_sut_image/tasks/main.yaml
@@ -0,0 +1,27 @@
+---
+# file: roles/csit_sut_image/tasks/main.yaml
+
+- name: Create a directory if it does not exist
+  file:
+    path: "/opt/csit-sut/"
+    state: "directory"
+    mode: 0755
+  tags: csit-sut-image
+
+- name: Copy Build Items
+  copy:
+    src: "{{ item }}"
+    dest: "/opt/csit-sut/"
+    owner: "root"
+    group: "root"
+    mode: 0755
+  with_items:
+    - Dockerfile
+    - supervisord.conf
+  tags: csit-sut-image
+
+- name: Build CSIT SUT Docker Image
+  shell: "docker build -t csit_sut-ubuntu1804:local ."
+  args:
+    chdir: "/opt/csit-sut"
+  tags: csit-sut-image
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/performance_tuning/defaults/main.yaml
index edec57aba0..612bc5a946 100644
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/performance_tuning/defaults/main.yaml
@@ -14,10 +14,4 @@ packages_by_arch:
   aarch64:
     - []
   x86_64:
-    - []
-
-grub_cmdline_linux:
-  aarch64:
-    - "GRUB_CMDLINE_LINUX=\"isolcpus={{ grub.isolcpus }} nohz_full={{ grub.nohz_full }} rcu_nocbs={{ grub.rcu_nocbs }} intel_iommu=on nmi_watchdog=0 audit=0 nosoftlockup processor.max_cstate=1\""
-  x86_64:
-    - "GRUB_CMDLINE_LINUX=\"isolcpus={{ grub.isolcpus }} nohz_full={{ grub.nohz_full }} rcu_nocbs={{ grub.rcu_nocbs }} numa_balancing=disable intel_pstate=disable intel_iommu=on iommu=pt nmi_watchdog=0 audit=0 nosoftlockup processor.max_cstate=1 intel_idle.max_cstate=1 hpet=disable tsc=reliable mce=off\""
+    - []
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml
index 3a8f35b57f..c437b40f86 100644
--- a/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/performance_tuning/tasks/main.yaml
@@ -19,7 +19,7 @@
     path: "/etc/default/grub"
     state: "present"
     regexp: "^GRUB_CMDLINE_LINUX="
-    line: "{{ grub_cmdline_linux[ansible_machine] | join() }}"
+    line: "GRUB_CMDLINE_LINUX=\"{% for key, value in grub.items() %}{% if value %}{{key}}={{value}} {% else %}{{key}} {% endif %}{% endfor %}\""
   notify:
     - "Update GRUB"
   tags:
diff --git a/resources/tools/testbed-setup/ansible/roles/vpp_device/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/vpp_device/tasks/main.yaml
index b93853b01f..33b551715f 100644
--- a/resources/tools/testbed-setup/ansible/roles/vpp_device/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/vpp_device/tasks/main.yaml
@@ -82,7 +82,7 @@
     path: "/etc/default/grub"
     state: "present"
     regexp: "^GRUB_CMDLINE_LINUX="
-    line: 'GRUB_CMDLINE_LINUX="hugepagesz=2M hugepages={{ grub.nr_hugepages }}"'
+    line: "GRUB_CMDLINE_LINUX=\"{% for key, value in grub.items() %}{% if value %}{{key}}={{value}} {% else %}{{key}} {% endif %}{% endfor %}\""
   notify:
     - "Update GRUB"
     - "Reboot server"
diff --git a/resources/tools/testbed-setup/ansible/sut.yaml b/resources/tools/testbed-setup/ansible/sut.yaml
index 68ac9b8364..302fa1b78d 100644
--- a/resources/tools/testbed-setup/ansible/sut.yaml
+++ b/resources/tools/testbed-setup/ansible/sut.yaml
@@ -24,6 +24,8 @@
       tags: kubernetes
     - role: kernel_vm
       tags: kernel_vm
+    - role: csit_sut_image
+      tags: csit_sut_image
     - role: performance_tuning
       tags: performance_tuning
     - role: cleanup
diff --git a/resources/tools/testbed-setup/ansible/vpp_device.yaml b/resources/tools/testbed-setup/ansible/vpp_device.yaml
index 8a99166f04..aae5ad3039 100644
--- a/resources/tools/testbed-setup/ansible/vpp_device.yaml
+++ b/resources/tools/testbed-setup/ansible/vpp_device.yaml
@@ -16,6 +16,8 @@
       tags: vpp_device
     - role: kernel_vm
       tags: kernel_vm
+    - role: csit_sut_image
+      tags: csit_sut_image
     - role: nomad
       tags: nomad
     - role: cleanup