From c903b87a23cedc56a29d023df50b649c0b9f1e59 Mon Sep 17 00:00:00 2001 From: Ahmed Abdelhalim Date: Mon, 22 Jun 2026 13:08:22 +0200 Subject: Use more stable approach for testing devices and fix linting issues This approach uses losetup to query the devices instead of flaky unstable cache! --- molecule/raspberrypi/converge.yml | 18 ++++++++++++++++-- molecule/raspberrypi/prepare.yml | 11 ++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) (limited to 'molecule') diff --git a/molecule/raspberrypi/converge.yml b/molecule/raspberrypi/converge.yml index 8acf53ff..db7b6303 100644 --- a/molecule/raspberrypi/converge.yml +++ b/molecule/raspberrypi/converge.yml @@ -1,4 +1,20 @@ --- +- name: "Discover test devices" + hosts: localhost + gather_facts: false + tasks: + - name: "Find loop device for vdd.img" + become: true + ansible.builtin.command: + cmd: "losetup -j /opt/vdd.img" + register: losetup_output + changed_when: false + + - name: "Inject backup_device into raspberrypi host vars" + ansible.builtin.add_host: + name: "raspberrypi" + backup_device: "{{ losetup_output.stdout.split(':')[0] }}" + - name: "Bootstrap" hosts: "raspberrypi" gather_facts: true @@ -61,12 +77,10 @@ password_store_repo_url: "https://github.com/octocat/Spoon-Knife" firefox_install_browserpass: true firefox_install_passff: true - backup_device: "{{ test_device }}" pre_tasks: - name: "Override is_chroot fact for container environment" ansible.builtin.set_fact: ansible_facts: "{{ ansible_facts | combine({'is_chroot': false}) }}" - test_device: "{{ hostvars['localhost']['test_device'] }}" roles: - role: "locales" - role: "timezone" diff --git a/molecule/raspberrypi/prepare.yml b/molecule/raspberrypi/prepare.yml index b34ca4c5..0d88f9d7 100644 --- a/molecule/raspberrypi/prepare.yml +++ b/molecule/raspberrypi/prepare.yml @@ -17,11 +17,12 @@ register: loop_device changed_when: true - - name: "Set test facts" - ansible.builtin.set_fact: - test_device: "{{ loop_device.stdout }}" - cacheable: true + - name: "Format test device as ext4" + become: true + community.general.filesystem: + fstype: "ext4" + dev: "{{ loop_device.stdout }}" - name: "Show test info" ansible.builtin.debug: - msg: "Test device: {{ test_device }}" + msg: "Test device: {{ loop_device.stdout }}" -- cgit v1.2.3