From 0b947247146f27936e986c262fc9f1d641b5ac4f Mon Sep 17 00:00:00 2001
From: Peter Mikus <pmikus@cisco.com>
Date: Wed, 17 Aug 2022 13:57:23 +0000
Subject: feat(ansible): Ubuntu Jammy VI.

Signed-off-by: Peter Mikus <pmikus@cisco.com>
Change-Id: I7dda690f2dc2e42bf6c67d3faa3327a03de3a9fa
---
 .../roles/calibration/defaults/main.yaml               | 14 ++------------
 fdio.infra.ansible/roles/calibration/tasks/main.yaml   | 18 +++++++++---------
 fdio.infra.ansible/roles/calibration/tasks/x86_64.yaml | 10 +++++-----
 3 files changed, 16 insertions(+), 26 deletions(-)

(limited to 'fdio.infra.ansible/roles/calibration')

diff --git a/fdio.infra.ansible/roles/calibration/defaults/main.yaml b/fdio.infra.ansible/roles/calibration/defaults/main.yaml
index bb904622e4..60cbc8b25f 100644
--- a/fdio.infra.ansible/roles/calibration/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/calibration/defaults/main.yaml
@@ -9,9 +9,6 @@ packages_base:
 
 packages_by_distro:
   ubuntu:
-    focal:
-      - "build-essential"
-      - "dmidecode"
     jammy:
       - "build-essential"
       - "dmidecode"
@@ -27,20 +24,13 @@ kernel_version: "{{ kernel_version_by_distro_by_arch[ansible_distribution | lowe
 
 kernel_version_by_distro_by_arch:
   ubuntu:
-    focal:
-      x86_64:
-        - "5.4.0-65-generic"
-        - "5.3.0-1020-azure"
-        - "5.4.0-1035-aws"
-      aarch64:
-        - "5.4.0-65-generic"
     jammy:
       x86_64:
-        - "5.15.0-0-generic" # Placeholder
+        - "5.15.0-46-generic" # Placeholder
         - "5.3.0-1020-azure" # Placeholder
         - "5.15.0-1000-aws" # Placeholder
       aarch64:
-        - "5.15.0-0-generic" # Placeholder
+        - "5.15.0-46-generic" # Placeholder
 
 pma_directory: "/tmp/pma_tools"
 jitter_core: 7
diff --git a/fdio.infra.ansible/roles/calibration/tasks/main.yaml b/fdio.infra.ansible/roles/calibration/tasks/main.yaml
index 62470b4d7f..5807d7e2a4 100644
--- a/fdio.infra.ansible/roles/calibration/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/calibration/tasks/main.yaml
@@ -2,7 +2,7 @@
 # file: roles/calibration/tasks/main.yaml
 
 - name: Inst - Update Package Cache (APT)
-  apt:
+  ansible.builtin.apt:
     update_cache: true
     cache_valid_time: 3600
   when:
@@ -11,21 +11,21 @@
     - calibration-inst-prerequisites
 
 - name: Inst - Prerequisites
-  package:
+  ansible.builtin.package:
     name: "{{ packages | flatten(levels=1) }}"
     state: latest
   tags:
     - calibration-inst-prerequisites
 
 - name: Check CPU Power States
-  shell: "lscpu"
+  ansible.builtin.shell: "lscpu"
   register: current_lscpu
   changed_when: false
   tags:
     - check-cpu-frequency
 
 - name: Check CPU Power States
-  assert:
+  ansible.builtin.assert:
     that:
       - "'CPU min MHz' not in current_lscpu.stdout or 'Intel(R) Xeon(R)' not in ansible_processor"
     fail_msg: "CPU configuration!"
@@ -34,7 +34,7 @@
     - check-cpu-frequency
 
 - name: Check Kernel Parameters
-  assert:
+  ansible.builtin.assert:
     that:
       - item in ansible_cmdline
     fail_msg: "Kernel parameters!"
@@ -46,7 +46,7 @@
     - check-kernel-params
 
 - name: Check Kernel Version
-  assert:
+  ansible.builtin.assert:
     that:
       - ansible_kernel not in kernel_version_by_distro_by_arch
     fail_msg: "Kernel version!"
@@ -55,14 +55,14 @@
     - check-kernel-version
 
 - name: Spectre Meltdown Checker Status
-  stat:
+  ansible.builtin.stat:
     path: "/opt/spectre-meltdown-checker.sh"
   register: spectre_meltdown_status
   tags:
     - check-spectre-meltdown
 
 - name: Get Spectre Meltdown Checker
-  get_url:
+  ansible.builtin.get_url:
     url: "https://meltdown.ovh"
     dest: "/opt/spectre-meltdown-checker.sh"
     mode: "744"
@@ -72,7 +72,7 @@
     - check-spectre-meltdown
 
 - name: Run Spectre Meltdown Checker
-  shell: "/opt/spectre-meltdown-checker.sh --no-color --sysfs-only || true"
+  ansible.builtin.shell: "/opt/spectre-meltdown-checker.sh --no-color --sysfs-only || true"
   ignore_errors: true
   register: spectre_meltdown_sync
   tags:
diff --git a/fdio.infra.ansible/roles/calibration/tasks/x86_64.yaml b/fdio.infra.ansible/roles/calibration/tasks/x86_64.yaml
index cb98c00c51..2d28f92ae3 100644
--- a/fdio.infra.ansible/roles/calibration/tasks/x86_64.yaml
+++ b/fdio.infra.ansible/roles/calibration/tasks/x86_64.yaml
@@ -2,19 +2,19 @@
 # file: roles/calibration/tasks/x86_64.yaml
 
 - name: Calibration - Clone PMA Tool
-  git:
+  ansible.builtin.git:
     repo: "https://gerrit.fd.io/r/pma_tools"
     dest: "{{ pma_directory }}"
   tags:
     - check-jitter-tool
 
 - name: Calibration - Compile PMA Tool
-  raw: "cd {{ pma_directory }}/jitter && make"
+  ansible.builtin.raw: "cd {{ pma_directory }}/jitter && make"
   tags:
     - check-jitter-tool
 
 - name: Calibration - Run Jitter Tool
-  shell: "{{ pma_directory }}/jitter/jitter -c {{ jitter_core }} -i {{ jitter_iterations }} -f"
+  ansible.builtin.shell: "{{ pma_directory }}/jitter/jitter -c {{ jitter_core }} -i {{ jitter_iterations }} -f"
   become: true
   async: 60
   poll: 0
@@ -24,12 +24,12 @@
     - check-jitter-tool
 
 - name: Check sync status
-  async_status:
+  ansible.builtin.async_status:
     jid: "{{ jitter_async.ansible_job_id }}"
   register: "jitter_poll_results"
   until: jitter_poll_results.finished
   retries: 30
 
-- debug: var=jitter_poll_results.stdout_lines
+- ansible.builtin.debug: var=jitter_poll_results.stdout_lines
   tags:
     - check-jitter-tool
-- 
cgit 1.2.3-korg