2 files changed, 33 insertions, 13 deletions
diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml
index c639f11088..5eb945328c 100644
--- a/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/calibration/defaults/main.yaml
@@ -2,15 +2,19 @@
 # file: roles/calibration/defaults/main.yaml
 
 # Packages to install.
-packages: "{{ packages_base + packages_by_distro[ansible_distribution | lower] + packages_by_arch[ansible_machine] }}"
+packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower][ansible_distribution_release] + packages_by_arch[ansible_machine] }}"
 
 packages_base:
   - []
 
 packages_by_distro:
   ubuntu:
-    - "build-essential"
-    - "dmidecode"
+    bionic:
+      - "build-essential"
+      - "dmidecode"
+    focal:
+      - "build-essential"
+      - "dmidecode"
 
 packages_by_arch:
   aarch64:
@@ -19,16 +23,24 @@ packages_by_arch:
     - []
 
 # Kernel version to check.
-kernel_version: "{{ kernel_version_by_distro_by_arch[ansible_distribution | lower][ansible_machine] }}"
+kernel_version: "{{ kernel_version_by_distro_by_arch[ansible_distribution | lower][ansible_distribution_release][ansible_machine] }}"
 
 kernel_version_by_distro_by_arch:
   ubuntu:
-    x86_64:
-      - "4.15.0-72-generic"
-      - "5.3.0-1020-azure"
-      - "5.3.0-1017-aws"
-    aarch64:
-      - "4.15.0-54-generic"
+    bionic:
+      x86_64:
+        - "4.15.0-72-generic"
+        - "5.3.0-1020-azure"
+        - "4.15.0-1057-aws"
+      aarch64:
+        - "4.15.0-54-generic"
+    focal:
+      x86_64:
+        - "5.4.0-65-generic"
+        - "5.3.0-1020-azure"
+        - "5.3.0-1017-aws"
+      aarch64:
+        - "5.4.0-65-generic"
 
 pma_directory: "/tmp/pma_tools"
 jitter_core: 7
diff --git a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
index a6e8898f9d..5d0c3b18ff 100644
--- a/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
+++ b/resources/tools/testbed-setup/ansible/roles/calibration/tasks/main.yaml
@@ -1,13 +1,21 @@
 ---
 # file: roles/calibration/tasks/main.yaml
 
-- 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:
+    - calibration-inst-prerequisites
+
+- name: Inst - Prerequisites
   package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest
-    update_cache: true
   tags:
-    - install-dependencies
+    - calibration-inst-prerequisites
 
 - name: Check CPU Power States
   shell: "lscpu"