Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PR #3937/f34c4544 backport][stable-4] Fix filesystem tests (so they run on their own) #3939

Merged
merged 1 commit into from
Dec 23, 2021
Merged

[PR #3937/f34c4544 backport][stable-4] Fix filesystem tests (so they run on their own) #3939

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions tests/integration/targets/filesystem/tasks/setup.yml
View file
Open in desktop
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