X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=fdio.infra.ansible%2Froles%2Fcalibration%2Ftasks%2Fmain.yaml;h=5807d7e2a407d6385f79cd0d5214144446417f18;hp=696f1c92651fa0eb0844edcf22ca87e0543aad1b;hb=0b947247146f27936e986c262fc9f1d641b5ac4f;hpb=df5672b3d9c29b51397f4770eb992c9f3f3955ce

diff --git a/fdio.infra.ansible/roles/calibration/tasks/main.yaml b/fdio.infra.ansible/roles/calibration/tasks/main.yaml
index 696f1c9265..5807d7e2a4 100644
--- a/fdio.infra.ansible/roles/calibration/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/calibration/tasks/main.yaml
@@ -2,8 +2,8 @@
 # file: roles/calibration/tasks/main.yaml
 
 - name: Inst - Update Package Cache (APT)
-  apt:
-    update_cache: yes
+  ansible.builtin.apt:
+    update_cache: true
     cache_valid_time: 3600
   when:
     - ansible_distribution|lower == 'ubuntu'
@@ -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,9 +34,9 @@
     - check-cpu-frequency
 
 - name: Check Kernel Parameters
-  assert:
+  ansible.builtin.assert:
     that:
-      - item in ansible_cmdline and grub[item] == ansible_cmdline[item]
+      - item in ansible_cmdline
     fail_msg: "Kernel parameters!"
     success_msg: "Kernel parameters match."
   loop: "{{ grub.keys()|sort }}"
@@ -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!"
@@ -54,20 +54,31 @@
   tags:
     - check-kernel-version
 
+- name: Spectre Meltdown Checker Status
+  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"
+  when:
+    - not spectre_meltdown_status.stat.exists
   tags:
     - check-spectre-meltdown
 
 - name: Run Spectre Meltdown Checker
-  shell: "/opt/spectre-meltdown-checker.sh --no-color || true"
-  async: 60
-  poll: 0
+  ansible.builtin.shell: "/opt/spectre-meltdown-checker.sh --no-color --sysfs-only || true"
   ignore_errors: true
-  register: spectre_meltdown_async
+  register: spectre_meltdown_sync
+  tags:
+    - check-spectre-meltdown
+
+- debug: var=spectre_meltdown_sync.stdout_lines
   tags:
     - check-spectre-meltdown
 
@@ -76,14 +87,3 @@
   tags:
     - check-machine-specific
     - check-jitter-tool
-
-- name: Check Sync Status
-  async_status:
-    jid: "{{ spectre_meltdown_async.ansible_job_id }}"
-  register: "spectre_meltdown_poll_results"
-  until: spectre_meltdown_poll_results.finished
-  retries: 30
-
-- debug: var=spectre_meltdown_poll_results.stdout_lines
-  tags:
-    - check-spectre-meltdown