3n-tsh timeout, testbed tags and ansible update

* disable AVF tests which don't work with x520
* increase VPPApiClient timeout to 14s, as x520 show hardware is slower
  on Taishan
* re-enable vhost and memif tests
* remove tx2 mrr daily tag list; no tx2 is used for perf testing
* remove taishan workaround
* add scipy arm prerequisites and scipy workaround
* rework inventories/lf_inventory/hosts; move cpu_microarchitecture to
host files

Change-Id: I5f10bd07b8146ac3b8be8c54fbb4d924a9373813
Signed-off-by: juraj.linkes <juraj.linkes@pantheon.tech>

46 files changed, 150 insertions, 145 deletions

diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh
index e576f99d8d..89c8f31914 100644
--- a/resources/libraries/bash/function/common.sh
+++ b/resources/libraries/bash/function/common.sh
@@ -800,11 +800,9 @@ function select_tags () {
             test_tag_array+=("!drv_avf")
             ;;
         *"3n-tsh"*)
+            # 3n-tsh only has x520 NICs which don't work with AVF
+            test_tag_array+=("!drv_avf")
             test_tag_array+=("!ipsechw")
-            test_tag_array+=("!memif")
-            test_tag_array+=("!srv6_proxy")
-            test_tag_array+=("!vhost")
-            test_tag_array+=("!vts")
             ;;
         *"3n-hsw"*)
             # TODO: Introduce NOIOMMU version of AVF tests.
@@ -905,7 +903,7 @@ function select_topology () {
             ;;
         "3n_tsh")
             TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_tsh*.yaml )
-            TOPOLOGIES_TAGS="3_node_*_link_topo"
+            TOPOLOGIES_TAGS="3_node_single_link_topo"
             ;;
         *)
             # No falling back to 3n_hsw default, that should have been done
diff --git a/resources/libraries/bash/function/mrr-daily-tx2.txt b/resources/libraries/bash/function/mrr-daily-tx2.txt
deleted file mode 120000
index addc759369..0000000000
--- a/resources/libraries/bash/function/mrr-daily-tx2.txt
+++ /dev/null
@@ -1 +0,0 @@
-mrr-daily.txt
\ No newline at end of file
diff --git a/resources/libraries/python/PapiExecutor.py b/resources/libraries/python/PapiExecutor.py
index 77732c7b05..a3f2479cff 100644
--- a/resources/libraries/python/PapiExecutor.py
+++ b/resources/libraries/python/PapiExecutor.py
@@ -193,7 +193,7 @@ class PapiSocketExecutor(object):
             # We need to create instance before removing from sys.path.
             cls.cached_vpp_instance = vpp_class(
                 use_socket=True, server_address="TBD", async_thread=False,
-                read_timeout=6, logger=FilteredLogger(logger, "INFO"))
+                read_timeout=14, logger=FilteredLogger(logger, "INFO"))
             # Cannot use loglevel parameter, robot.api.logger lacks support.
             # TODO: Stop overriding read_timeout when VPP-1722 is fixed.
         finally:
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml
index f21ef477a5..907f5aff40 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/group_vars/all.yaml
@@ -47,6 +47,9 @@ dpdk:
   target_dir: '/opt'
   version: 'dpdk-19.02'
   url: 'https://fast.dpdk.org/rel'
+  build_targets:
+    aarch64: "arm64-armv8a"
+    x86_64: "x86_64-native"
 
 # Calibration settings.
 jitter:
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 740c4755db..da05b564a8 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_cimc_hostname: '10.30.50.16'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "haswell"
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 0df2da30ed..5f35ae5bb4 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_cimc_hostname: '10.30.50.17'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "haswell"
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 4d00c388c7..ba8dff6609 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_cimc_hostname: '10.30.50.18'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "haswell"
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 688db252a1..7340b44d77 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_cimc_hostname: '10.30.50.20'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "haswell"
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 79dd07493f..6e8c9051c3 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_cimc_hostname: '10.30.50.21'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "haswell"
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 69bc1178be..36c9973363 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_cimc_hostname: '10.30.50.22'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "haswell"
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 f4db10ee44..92385459f6 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_cimc_hostname: '10.30.50.24'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "haswell"
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 6a8c9f28b3..4d19fd9001 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_cimc_hostname: '10.30.50.25'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "haswell"
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 d914eb17f8..434295e197 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_cimc_hostname: '10.30.50.26'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "haswell"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml
index 5e81b3573c..dd3a9ea2e8 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.30.51.28.yaml
@@ -11,3 +11,4 @@ virl_public_port: "eth0"
 
 inventory_cimc_hostname: '10.30.50.28'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "haswell"
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 e015def65b..3469427eac 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
@@ -12,4 +12,4 @@ sysctl:
   vm:
     nr_hugepages: 4096
     max_map_count: 20000
-taishan_workaround: True
+cpu_microarchitecture: "taishan"
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 e29c00a97c..64a56a8ebb 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
@@ -12,4 +12,4 @@ sysctl:
   vm:
     nr_hugepages: 4096
     max_map_count: 20000
-taishan_workaround: True
+cpu_microarchitecture: "taishan"
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 85f4dd7d5b..27beaf5225 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.50.41'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "skylake"
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 be27ba59c1..240daeba3d 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.50.42'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "skylake"
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 74ad358587..9b3c847d3b 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.50.43'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "skylake"
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 f1313329a8..33e18fefcb 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.50.44'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "skylake"
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 e0860e4d52..51e35c7ea0 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.50.45'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "skylake"
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 23733be8d0..a4bd79a854 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.50.46'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "skylake"
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 36e2f8e840..52adadbf10 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
@@ -7,3 +7,4 @@ grub:
 
 inventory_ipmi_hostname: '10.30.50.47'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+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 472878a635..59767dbdf5 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
@@ -7,3 +7,4 @@ grub:
 
 inventory_ipmi_hostname: '10.30.50.48'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+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 a813ac6e90..0e3c7e625d 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.50.49'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "skylake"
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 d85d56f51e..baaa0746c5 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.50.50'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "skylake"
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 d4676dda64..e462460b23 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.50.51'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "skylake"
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 61f61c7413..97b4058872 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.50.52'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "skylake"
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 0fecacacb3..b5131a310a 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.50.53'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "skylake"
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 e56d03652b..b787acade2 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.50.54'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "skylake"
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 03f364819a..e3d108eb4e 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.50.55'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "skylake"
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 b1aa02a1ec..24d4191a32 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.50.56'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "skylake"
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 ec62ec4060..52124bf08d 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.50.57'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "skylake"
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 7d917c5e8b..7d0be75718 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
@@ -5,3 +5,4 @@ hostname: "s27-t13-sut1"
 vfs_data_file: "csit-initialize-vfs-tx2.sh"
 grub:
   nr_hugepages: 57344
+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 c28319110d..f2091b71a8 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.55.10'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "skylake"
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 994e9eb11e..c6f68f9d49 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.55.11'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "denverton"
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 927ea28168..ac60058fff 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.55.12'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "denverton"
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 c536c13fde..c5e544fd4c 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
@@ -15,3 +15,4 @@ sysctl:
 
 inventory_ipmi_hostname: '10.30.55.13'
 cobbler_profile: 'ubuntu-18.04.2-server-x86_64'
+cpu_microarchitecture: "denverton"
diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts
index 80655bab27..af29bea2d2 100644
--- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts
+++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/hosts
@@ -1,66 +1,45 @@
 all:
   children:
-    haswell:
-      children:
-        tg:
-          hosts:
-            10.30.51.16: null #t1-tg1
-            10.30.51.20: null #t2-tg1
-            10.30.51.24: null #t3-tg1
-        sut:
-          hosts:
-            10.30.51.17: null #t1-sut1
-            10.30.51.18: null #t1-sut2
-            10.30.51.21: null #t2-sut1
-            10.30.51.22: null #t2-sut2
-            10.30.51.25: null #t3-sut1
-            10.30.51.26: null #t3-sut2
-        cobbler:
-          hosts:
-            10.30.51.28: null #s4-virl1
-    skylake:
-      children:
-        tg:
-          hosts:
-            10.30.51.45: null #s4-t21-tg1
-            10.30.51.48: null #s13-t31-tg1
-            10.30.51.49: null #s19-t33t34-tg1
-            10.30.51.53: null #s6-t22-tg1
-            10.30.51.55: null #s8-t23-tg1
-            10.30.51.57: null #s10-t24-tg1
-            10.30.51.60: null #s16-t32-tg1
-            10.32.8.10: null #s28-t26t35-tg1
-        sut:
-          hosts:
-            10.30.51.44: null #s3-t21-sut1
-            10.30.51.46: null #s11-t31-sut1
-            10.30.51.47: null #s12-t31-sut2
-            10.30.51.52: null #s5-t22-sut1
-            10.30.51.54: null #s7-t23-sut1
-            10.30.51.56: null #s9-t24-sut1
-            10.30.51.58: null #s14-t32-sut1
-            10.30.51.59: null #s15-t32-sut2
-        vpp_device:
-          hosts:
-            10.30.51.50: null #s1-t11-sut1
-            10.30.51.51: null #s2-t12-sut1
-    denverton:
-      children:
-        sut:
-          hosts:
-            10.32.8.11: null #s29-t26-sut1
-            10.32.8.12: null #s30-t35-sut1
-            10.32.8.13: null #s31-t35-sut2
-    thunderx2:
-      children:
-        vpp_device:
-          hosts:
-            10.30.51.69: null #s27-t13-sut1
-    taishan:
-      children:
-#        tg:
-#          hosts:
-        sut:
-          hosts:
-            10.30.51.36: null #s17-t33-sut1
-            10.30.51.37: null #s18-t33-sut2
+    tg:
+      hosts:
+        10.30.51.16: #t1-tg1 - haswell
+        10.30.51.20: #t2-tg1 - haswell
+        10.30.51.24: #t3-tg1 - haswell
+        10.30.51.45: #s4-t21-tg1 - skylake
+        10.30.51.48: #s13-t31-tg1 - skylake
+        10.30.51.49: #s19-t33t34-tg1 - skylake
+        10.30.51.53: #s6-t22-tg1 - skylake
+        10.30.51.55: #s8-t23-tg1 - skylake
+        10.30.51.57: #s10-t24-tg1 - skylake
+        10.30.51.60: #s16-t32-tg1 - skylake
+        10.32.8.10: #s28-t26t35-tg1 - skylake
+    sut:
+      hosts:
+        10.30.51.17: #t1-sut1 - haswell
+        10.30.51.18: #t1-sut2 - haswell
+        10.30.51.21: #t2-sut1 - haswell
+        10.30.51.22: #t2-sut2 - haswell
+        10.30.51.25: #t3-sut1 - haswell
+        10.30.51.26: #t3-sut2 - haswell
+        10.30.51.36: #s17-t33-sut1 - taishan
+        10.30.51.37: #s18-t33-sut2 - taishan
+        10.30.51.44: #s3-t21-sut1 - skylake
+        10.30.51.46: #s11-t31-sut1 - skylake
+        10.30.51.47: #s12-t31-sut2 - skylake
+        10.30.51.52: #s5-t22-sut1 - skylake
+        10.30.51.54: #s7-t23-sut1 - skylake
+        10.30.51.56: #s9-t24-sut1 - skylake
+        10.30.51.58: #s14-t32-sut1 - skylake
+        10.30.51.59: #s15-t32-sut2 - skylake
+        10.32.8.11: #s29-t26-sut1 - denverton
+        10.32.8.12: #s30-t35-sut1 - denverton
+        10.32.8.13: #s31-t35-sut2 - denverton
+
+    vpp_device:
+      hosts:
+        10.30.51.50: #s1-t11-sut1 - skylake
+        10.30.51.51: #s2-t12-sut1 - skylake
+        10.30.51.69: #s27-t13-sut1 - thunderx2
+    cobbler:
+      hosts:
+        10.30.51.28: #s4-virl1 - haswell
diff --git a/resources/tools/testbed-setup/ansible/roles/sut/files/taishan_workaround.service b/resources/tools/testbed-setup/ansible/roles/sut/files/taishan_workaround.service
deleted file mode 100644
index 246c985baa..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/sut/files/taishan_workaround.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Numa node workaround configuration
-
-[Service]
-ExecStart=/bin/sh -c 'echo 1 > /sys/bus/pci/devices/0000:11:00.0/numa_node'
-ExecStart=/bin/sh -c 'echo 1 > /sys/bus/pci/devices/0000:11:00.1/numa_node'
-Type=oneshot
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
diff --git a/resources/tools/testbed-setup/ansible/roles/sut/tasks/dpdk.yaml b/resources/tools/testbed-setup/ansible/roles/sut/tasks/dpdk.yaml
index a4ae7790bf..f2fc83edae 100644
--- a/resources/tools/testbed-setup/ansible/roles/sut/tasks/dpdk.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/sut/tasks/dpdk.yaml
@@ -18,6 +18,6 @@
 
 - name: Compile DPDK release
   become: yes
-  command: 'make install T={{ ansible_machine }}-native-linuxapp-gcc DESTDIR={{ dpdk.target_dir }}/{{ dpdk.version }} chdir={{ dpdk.target_dir }}/{{ dpdk.version }}'
+  command: 'make install T={{ dpdk.build_targets[ansible_machine] }}-linuxapp-gcc DESTDIR={{ dpdk.target_dir }}/{{ dpdk.version }} chdir={{ dpdk.target_dir }}/{{ dpdk.version }}'
   when: 'linux__dpdk_extracted'
   tags: install-dpdk
diff --git a/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml
index e4115e485d..a882001868 100644
--- a/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/sut/tasks/main.yaml
@@ -5,10 +5,6 @@
   include_tasks: '{{ ansible_distribution|lower }}_{{ ansible_distribution_release }}.yaml'
   tags: [ install-csit-dependencies, install-kernel-image ]
 
-- name: Taishan aarch64 specific
-  import_tasks: taishan_workaround.yaml
-  when: taishan_workaround is defined
-
 - name: Copy 80-vpp.conf
   file:
     src: '/dev/null'
diff --git a/resources/tools/testbed-setup/ansible/roles/sut/tasks/taishan_workaround.yaml b/resources/tools/testbed-setup/ansible/roles/sut/tasks/taishan_workaround.yaml
deleted file mode 100644
index e262e7288b..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/sut/tasks/taishan_workaround.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
----
-# file: roles/sut/tasks/taishan_workaround.yaml
-
-- name: Ensure systemd directory exists
-  file:
-    path: "/etc/systemd/system"
-    state: "directory"
-    owner: "root"
-    group: "root"
-    mode: "0755"
-  tags: taishan-workaround
-
-- name: Copy systemd numa config unit file
-  template:
-    src: "files/taishan_workaround.service"
-    dest: "/etc/systemd/system/nic-numa-config.service"
-    owner: "root"
-    group: "root"
-    mode: "0644"
-  register: numa_config_service
-  tags: taishan-workaround
-
-- name: Reload systemd daemon
-  command: "systemctl daemon-reload"
-  when: (numa_config_service and numa_config_service is changed)
-  tags: taishan-workaround
-
-- name: Enable numa config service
-  command: "systemctl enable nic-numa-config.service"
-  tags: taishan-workaround
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/aarch64.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/aarch64.yaml
index 591002606b..2a481335a0 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/aarch64.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/aarch64.yaml
@@ -10,3 +10,41 @@
   notify: ['Update GRUB']
   tags: set-grub
 
+- name: Install SciPy dependencies
+  apt:
+    name:
+      - 'gfortran'
+      - 'libblas-dev'
+      - 'liblapack-dev'
+    state: 'present'
+    install_recommends: False
+  tags: install-pip
+
+- name: Install CSIT PIP requirements without SciPy
+  pip:
+    name:
+      - 'docopt==0.6.2'
+      - 'ecdsa==0.13'
+      - 'enum34==1.1.2'
+      - 'ipaddress==1.0.16'
+      - 'paramiko==1.16.0'
+      - 'pexpect==4.6.0'
+      - 'pycrypto==2.6.1'
+      - 'pykwalify==1.5.0'
+      - 'pypcap==1.1.5'
+      - 'python-dateutil==2.4.2'
+      - 'PyYAML==3.11'
+      - 'requests==2.9.1'
+      - 'robotframework==2.9.2'
+      - 'scapy==2.3.1'
+      - 'scp==0.10.2'
+      - 'six==1.12.0'
+      - 'dill==0.2.8.2'
+      - 'numpy==1.14.5'
+  tags: install-pip
+
+- name: Install CSIT PIP requirements - SciPy workaround
+  pip:
+    name:
+      - 'scipy==1.1.0'
+  tags: install-pip
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml
index d9026e9182..f586e871c7 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/main.yaml
@@ -7,9 +7,9 @@
 - name: Machine specifics
   include_tasks: '{{ ansible_machine }}.yaml'
 
-- name: skylake specific
+- name: Skylake specific
   import_tasks: skylake.yaml
-  when: ("skylake" in groups) and inventory_hostname in groups['skylake']
+  when: cpu_microarchitecture == "skylake"
 
 - name: Copy netplan network config file
   template:
@@ -53,30 +53,6 @@
     enabled: 'no'
   tags: set-ondemand
 
-- name: Install CSIT PIP requirements
-  pip:
-    name:
-      - 'docopt==0.6.2'
-      - 'ecdsa==0.13'
-      - 'enum34==1.1.2'
-      - 'ipaddress==1.0.16'
-      - 'paramiko==1.16.0'
-      - 'pexpect==4.6.0'
-      - 'pycrypto==2.6.1'
-      - 'pykwalify==1.5.0'
-      - 'pypcap==1.1.5'
-      - 'python-dateutil==2.4.2'
-      - 'PyYAML==3.11'
-      - 'requests==2.9.1'
-      - 'robotframework==2.9.2'
-      - 'scapy==2.3.1'
-      - 'scp==0.10.2'
-      - 'six==1.12.0'
-      - 'dill==0.2.8.2'
-      - 'numpy==1.14.5'
-      - 'scipy==1.1.0'
-  tags: install-pip
-
 - name: Install VPP PIP requirements
   pip:
     name:
diff --git a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/x86_64.yaml b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/x86_64.yaml
index dc0b685a7f..45d6cc31f1 100644
--- a/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/x86_64.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/tg_sut/tasks/x86_64.yaml
@@ -20,3 +20,28 @@
   tags: set-grub
 
 - meta: flush_handlers
+
+- name: Install CSIT PIP requirements
+  pip:
+    name:
+      - 'docopt==0.6.2'
+      - 'ecdsa==0.13'
+      - 'enum34==1.1.2'
+      - 'ipaddress==1.0.16'
+      - 'paramiko==1.16.0'
+      - 'pexpect==4.6.0'
+      - 'pycrypto==2.6.1'
+      - 'pykwalify==1.5.0'
+      - 'pypcap==1.1.5'
+      - 'python-dateutil==2.4.2'
+      - 'PyYAML==3.11'
+      - 'requests==2.9.1'
+      - 'robotframework==2.9.2'
+      - 'scapy==2.3.1'
+      - 'scp==0.10.2'
+      - 'six==1.12.0'
+      - 'dill==0.2.8.2'
+      - 'numpy==1.14.5'
+      - 'scipy==1.1.0'
+  tags: install-pip
+