Skip to content

Commit

Permalink
Fix filesystem tests (so they run on their own) (ansible-collections#…
Browse files Browse the repository at this point in the history
…3937) (ansible-collections#3938)

* Don't use loops for installing packages.

* Install util-linux-systemd on OpenSuSE so that findmnt is around.

(cherry picked from commit f34c454)

Co-authored-by: Felix Fontein <felix@fontein.de>
  • Loading branch information
patchback[bot] and felixfontein committed Dec 23, 2021
1 parent 093036a commit 73580d0
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions tests/integration/targets/filesystem/tasks/setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
state: present
# xfsprogs on OpenSUSE requires Python 3, skip this for our newer Py2 OpenSUSE builds
when: not (item == 'xfsprogs' and ansible_os_family == 'Suse' and ansible_python.version.major == 2 and ansible_distribution_major_version|int != 42)
with_items:
loop:
- e2fsprogs
- xfsprogs

Expand All @@ -32,12 +32,11 @@

- name: "Install btrfs progs (OpenSuse)"
ansible.builtin.package:
name: '{{ item }}'
name:
- python{{ ansible_python.version.major }}-xml
- btrfsprogs
state: present
when: ansible_os_family == 'Suse'
with_items:
- python{{ ansible_python.version.major }}-xml
- btrfsprogs

- name: "Install reiserfs utils (Fedora)"
ansible.builtin.package:
Expand All @@ -46,9 +45,11 @@
when:
- ansible_distribution == 'Fedora' and (ansible_facts.distribution_major_version | int < 35)

- name: "Install reiserfs (OpenSuse)"
- name: "Install reiserfs and util-linux-systemd (for findmnt) (OpenSuse)"
ansible.builtin.package:
name: reiserfs
name:
- reiserfs
- util-linux-systemd
state: present
when:
- ansible_os_family == 'Suse'
Expand Down Expand Up @@ -100,10 +101,9 @@

- name: "Install dosfstools and lvm2 (Linux)"
ansible.builtin.package:
name: '{{ item }}'
with_items:
- dosfstools
- lvm2
name:
- dosfstools
- lvm2
when: ansible_system == 'Linux'

- name: "Install fatresize and get version"
Expand Down

0 comments on commit 73580d0

Please sign in to comment.