From: Iker Pedrosa Date: Wed, 29 May 2024 13:55:13 +0000 (+0200) Subject: share/ansible: implement distribution selection X-Git-Tag: 4.17.0-rc1~99 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d8fb10f7b745e8c314b99994aba44d8c64ab888d;p=thirdparty%2Fshadow.git share/ansible: implement distribution selection Distribution to run can be selected when running `ansible-playbook` by appending `-e 'distribution=fedora'` to the command. Signed-off-by: Iker Pedrosa --- diff --git a/share/ansible/playbook.yml b/share/ansible/playbook.yml index 95a4cb887..6e69e2e19 100644 --- a/share/ansible/playbook.yml +++ b/share/ansible/playbook.yml @@ -1,9 +1,13 @@ - name: Start build container hosts: localhost + vars: + image: + fedora: registry.fedoraproject.org/fedora:latest + alpine: docker.io/library/alpine:latest + debian: docker.io/library/debian:latest + roles: - role: build_container - vars: - container_image: registry.fedoraproject.org/fedora:latest - name: CI run hosts: builder diff --git a/share/ansible/roles/build_container/tasks/main.yml b/share/ansible/roles/build_container/tasks/main.yml index f7d3dbc56..c9a14f07e 100644 --- a/share/ansible/roles/build_container/tasks/main.yml +++ b/share/ansible/roles/build_container/tasks/main.yml @@ -2,13 +2,13 @@ # tasks file for build_container - name: Pull container image containers.podman.podman_image: - name: '{{ container_image }}' + name: '{{ image[distribution] }}' - name: Create and start container containers.podman.podman_container: name: builder state: started - image: '{{ container_image }}' + image: '{{ image[distribution] }}' command: "sleep 1d" - name: Create repo diff --git a/share/ansible/roles/ci_run/tasks/main.yml b/share/ansible/roles/ci_run/tasks/main.yml index 49d7b72a5..209c2ab02 100644 --- a/share/ansible/roles/ci_run/tasks/main.yml +++ b/share/ansible/roles/ci_run/tasks/main.yml @@ -1,8 +1,4 @@ --- # tasks file for ci_run - name: 'Include distribution specific ci_run tasks fedora' - include_tasks: '{{ include_file }}' - loop_control: - loop_var: include_file - with_first_found: - - files: fedora.yml + include_tasks: '{{ distribution }}.yml'