X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=automation%2Fansible%2Froles%2Fdocker%2Ftasks%2Fmain.yml;h=c8bbae3b17f96d3bd11fc46d4d18887ed4c39e17;hb=30b28562b262df9cfcf243afe50b13100db58a8f;hp=775c70c1b9d258061c600df5e67825647963a5f1;hpb=ebb0ea56586f8838cee161d0eceb2ce304296be1;p=lttng-ci.git

diff --git a/automation/ansible/roles/docker/tasks/main.yml b/automation/ansible/roles/docker/tasks/main.yml
index 775c70c..c8bbae3 100644
--- a/automation/ansible/roles/docker/tasks/main.yml
+++ b/automation/ansible/roles/docker/tasks/main.yml
@@ -1,20 +1,19 @@
 ---
-
-- when: ansible_distribution_release in ['trixie', 'sid']
-  ansible.builtin.set_fact:
-    docker_upstream: false
-- ansible.builtin.set_fact:
-    docker_packages: "{{docker_upstream|ternary(docker_upstream_packages, lookup('vars', 'docker_' + ansible_distribution + '_packages', default=[]))}}"
-- when: docker_upstream
-  block:
-    - name: Add upstream docker apt key
-      ansible.builtin.apt_key:
-        url: 'https://download.docker.com/linux/debian/gpg'
-    - name: Add upstream docker sources
-      when: ansible_distribution == 'Debian'
-      ansible.builtin.apt_repository:
-        filename: 'docker'
-        repo: "deb https://download.docker.com/linux/debian {{ansible_distribution_release}} stable"
+- name: Include OS-specific variables
+  ansible.builtin.include_vars: "{{item}}"
+  with_first_found:
+    - files:
+        - "{{ansible_distribution}}-{{ansible_distribution_major_version}}.yml"
+        - "{{ansible_distribution}}-{{ansible_distribution_release}}.yml"
+        - "{{ansible_distribution}}.yml"
+        - "{{ansible_os_family}}.yml"
+      skip: true
+- name: OS-specific setup
+  ansible.builtin.include_tasks: "{{item}}"
+  with_first_found:
+    - files:
+        - "setup-{{ansible_os_family}}.yml"
+      skip: true
 - name: Deploy docker network configuration
   block:
     - name: Create docker configuration directory