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>

1 files changed, 43 insertions, 64 deletions

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