1 files changed, 25 insertions, 17 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
index e60b32ae2a..91fcd188a6 100644
--- a/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/common/tasks/main.yaml
@@ -1,7 +1,7 @@
 ---
 # file: roles/common/tasks/main.yaml
 
-- name: Add permanent proxy settings
+- name: Conf - Add permanent proxy settings
   lineinfile:
     path: "/etc/environment"
     state: "present"
@@ -9,17 +9,25 @@
   with_dict: "{{ proxy_env }}"
   when: proxy_env is defined
   tags:
-    - set-proxy
+    - common-conf-proxy
 
-- name: Install Distribution - Release - Machine Prerequisites
+- name: Inst - Update package cache (apt)
+  apt:
+    update_cache: yes
+    cache_valid_time: 3600
+  when:
+    - ansible_distribution|lower == 'ubuntu'
+  tags:
+    - common-inst-prerequisites
+
+- name: Inst - Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest
-    update_cache: true
   tags:
-    - install-dependencies
+    - common-inst-prerequisites
 
-- name: Install CSIT PIP requirements
+- name: Inst - CSIT PIP requirements
   pip:
     name:
       - "ecdsa==0.13.3"
@@ -31,7 +39,7 @@
       - "robotframework==3.1.2"
       - "scapy==2.4.3"
       - "scp==0.13.2"
-      - "ansible==2.7.8"
+      - "ansible==2.10.7"
       - "dill==0.2.8.2"
       - "numpy==1.17.3"
       - "hdrhistogram==0.6.1"
@@ -73,24 +81,24 @@
       - "sphinxcontrib-serializinghtml==1.1.3"
       - "urllib3==1.25.6"
   tags:
-    - install-pip
+    - common-inst-pip
 
-- name: Install CSIT PIP requirements - Pandas and SciPy workaround
+- name: Inst - CSIT PIP requirements - Pandas and SciPy workaround
   pip:
     name:
       - "pandas==0.25.3"
-      - "scipy==1.1.0"
+      - "scipy==1.5.4"
   tags:
-    - install-pip
+    - common-inst-pip
 
-- name: Install Meson (repository version is too old)
+- name: Inst - Meson (DPDK)
   pip:
     name:
       - "meson==0.47.1"
   tags:
-    - install-meson
+    - common-inst-meson
 
-- name: Set sudoers admin
+- name: Conf - sudoers admin
   lineinfile:
     path: "/etc/sudoers"
     state: "present"
@@ -98,9 +106,9 @@
     line: "%admin ALL=(ALL) ALL"
     validate: "/usr/sbin/visudo -cf %s"
   tags:
-    - set-sudoers
+    - common-conf-sudoers
 
-- name: Set sudoers sudo
+- name: Conf - sudoers nopasswd
   lineinfile:
     path: "/etc/sudoers"
     state: "present"
@@ -108,6 +116,6 @@
     line: "%sudo ALL=(ALL:ALL) NOPASSWD: ALL"
     validate: "/usr/sbin/visudo -cf %s"
   tags:
-    - set-sudoers
+    - common-conf-sudoers
 
 - meta: flush_handlers