cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix filesystem tests on OpenSUSE 15+ (#52716)

Browse source
This commit is contained in:
Jordan Borean 2019-02-22 08:15:12 +10:00 committed by GitHub
parent ee14b123f3
commit 5e3e0eb946
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
test/integration/targets/filesystem/tasks/main.yml
View file

@ -37,4 +37,8 @@
# https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.23/v2.23-ReleaseNotes # https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.23/v2.23-ReleaseNotes
- 'not (item.0.key == "f2fs" and ansible_distribution == "Ubuntu" and ansible_distribution_version is version("14.04", "<="))' - 'not (item.0.key == "f2fs" and ansible_distribution == "Ubuntu" and ansible_distribution_version is version("14.04", "<="))'
- 'not (item.1 == "overwrite_another_fs" and ansible_system == "FreeBSD")' - 'not (item.1 == "overwrite_another_fs" and ansible_system == "FreeBSD")'
# 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.0.key == "xfs" and ansible_os_family == "Suse" and ansible_python.version.major == 2 and ansible_distribution_major_version|int != 42)'
loop: "{{ query('dict', tested_filesystems)|product(['create_fs', 'overwrite_another_fs'])|list }}" loop: "{{ query('dict', tested_filesystems)|product(['create_fs', 'overwrite_another_fs'])|list }}"

4
test/integration/targets/filesystem/tasks/setup.yml
View file

@ -2,6 +2,8 @@
package: package:
name: '{{ item }}' name: '{{ item }}'
state: present 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: with_items:
- e2fsprogs - e2fsprogs
- xfsprogs - xfsprogs
@ -29,7 +31,7 @@
state: present state: present
when: ansible_os_family == 'Suse' when: ansible_os_family == 'Suse'
with_items: with_items:
- python-xml - python{{ ansible_python.version.major }}-xml
- btrfsprogs - btrfsprogs
- name: install ocfs2 (Debian) - name: install ocfs2 (Debian)