ansible: add support for ansible 2.16

[lttng-ci.git] / automation / ansible / roles / cross-compilers / tasks / main.yml

diff --git a/automation/ansible/roles/cross-compilers/tasks/main.yml b/automation/ansible/roles/cross-compilers/tasks/main.yml
index 071456aab3ae0d12a4a2324cf93b1a8d81c77076..02c71353f6a799a328449d4af8a1db3bcef40701 100644 (file)
--- a/automation/ansible/roles/cross-compilers/tasks/main.yml
+++ b/automation/ansible/roles/cross-compilers/tasks/main.yml
@@ -1,19 +1,19 @@
 ---
 # Include variables and define needed variables.
 - name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
-
-- name: Define cross_compilers_packages.
-  set_fact:
-    cross_compilers_packages: "{{ __cross_compilers_packages | list }}"
-  when: cross_compilers_packages is not defined
+  ansible.builtin.include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+    - "{{ ansible_distribution }}-{{ ansible_distribution_release }}.yml"
+    - "{{ ansible_distribution }}.yml"
+    - "{{ ansible_os_family }}.yml"
 
 # Setup/install tasks.
-- include: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
+- ansible.builtin.include_tasks: setup-RedHat.yml
+  when: ansible_os_family in ['RedHat', 'Rocky']
 
-- include: setup-Debian.yml
+- ansible.builtin.include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
-- include: setup-Alpine.yml
+- ansible.builtin.include_tasks: setup-Alpine.yml
   when: ansible_os_family == 'Alpine'