fix filesystem tests on OpenSUSE 15+ (#52716)
(cherry picked from commit 5e3e0eb946
)
This commit is contained in:
parent
8964ef5cfc
commit
68507a55b8
2 changed files with 8 additions and 2 deletions
|
@ -26,4 +26,7 @@
|
|||
# https://www.kernel.org/pub/linux/utils/util-linux/v2.21/v2.21-ChangeLog
|
||||
# https://anonscm.debian.org/cgit/collab-maint/pkg-util-linux.git/commit/?id=04f7020eadf31efc731558df92daa0a1c336c46c
|
||||
- 'not (item.key == "btrfs" and (ansible_distribution == "Ubuntu" and ansible_distribution_release == "trusty"))'
|
||||
# The xfsprogs package on newer versions of OpenSUSE (15+) require Python 3, we skip this on our Python 2 container
|
||||
# OpenSUSE 42.3 Python2 and the other py3 containers are not affected so we will continue to run that
|
||||
- 'not (item.key == "xfs" and ansible_os_family == "Suse" and ansible_python.version.major == 2 and ansible_distribution_major_version|int != 42)'
|
||||
loop: "{{ lookup('dict', tested_filesystems) }}"
|
||||
|
|
|
@ -2,7 +2,10 @@
|
|||
package:
|
||||
name: '{{ item }}'
|
||||
state: present
|
||||
when: ansible_system == 'Linux' or item != 'dosfstools'
|
||||
when:
|
||||
- ansible_system == 'Linux' or item != 'dosfstools'
|
||||
# xfsprogs on OpenSUSE requires Python 3, skip this for our newer Py2 OpenSUSE builds
|
||||
- not (item == 'xfsprogs' and ansible_os_family == 'Suse' and ansible_python.version.major == 2 and ansible_distribution_major_version|int != 42)
|
||||
with_items:
|
||||
- e2fsprogs
|
||||
- xfsprogs
|
||||
|
@ -27,7 +30,7 @@
|
|||
state: present
|
||||
when: ansible_os_family == 'Suse'
|
||||
with_items:
|
||||
- python-xml
|
||||
- python{{ ansible_python.version.major }}-xml
|
||||
- btrfsprogs
|
||||
|
||||
- name: install ocfs2 (Debian)
|
||||
|
|
Loading…
Reference in a new issue