ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fix filesystem tests (so they run on their own) (#3937) (#3938)

Browse source 
* Don't use loops for installing packages.

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

(cherry picked from commit f34c454412)

Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
patchback[bot] 2021-12-23 12:38:22 +01:00 committed by GitHub
parent 093036a2ae
commit 73580d09e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
tests/integration/targets/filesystem/tasks/setup.yml
View file

@ -8,7 +8,7 @@
state: present state: present
# xfsprogs on OpenSUSE requires Python 3, skip this for our newer Py2 OpenSUSE builds # 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) 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 - e2fsprogs
- xfsprogs - xfsprogs
@ -32,12 +32,11 @@
- name: "Install btrfs progs (OpenSuse)" - name: "Install btrfs progs (OpenSuse)"
ansible.builtin.package: ansible.builtin.package:
name: '{{ item }}' name:
state: present
when: ansible_os_family == 'Suse'
with_items:
- python{{ ansible_python.version.major }}-xml - python{{ ansible_python.version.major }}-xml
- btrfsprogs - btrfsprogs
state: present
when: ansible_os_family == 'Suse'
- name: "Install reiserfs utils (Fedora)" - name: "Install reiserfs utils (Fedora)"
ansible.builtin.package: ansible.builtin.package:
@ -46,9 +45,11 @@
when: when:
- ansible_distribution == 'Fedora' and (ansible_facts.distribution_major_version | int < 35) - 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: ansible.builtin.package:
name: reiserfs name:
- reiserfs
- util-linux-systemd
state: present state: present
when: when:
- ansible_os_family == 'Suse' - ansible_os_family == 'Suse'
@ -100,8 +101,7 @@
- name: "Install dosfstools and lvm2 (Linux)" - name: "Install dosfstools and lvm2 (Linux)"
ansible.builtin.package: ansible.builtin.package:
name: '{{ item }}' name:
with_items:
- dosfstools - dosfstools
- lvm2 - lvm2
when: ansible_system == 'Linux' when: ansible_system == 'Linux'