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>

3 files changed, 65 insertions, 26 deletions

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
+