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>

4 files changed, 1 insertions, 46 deletions

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