From f1566f07db07944d5493ffbebe68df659500e8df Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Fri, 22 Feb 2019 08:15:12 +1000 Subject: [PATCH] fix filesystem tests on OpenSUSE 15+ (#52716) (cherry picked from commit 5e3e0eb9461684ab089f7bd45de0b6a9ca15d0fb) --- test/integration/targets/filesystem/tasks/main.yml | 3 +++ test/integration/targets/filesystem/tasks/setup.yml | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/test/integration/targets/filesystem/tasks/main.yml b/test/integration/targets/filesystem/tasks/main.yml index a5419981e3b..5ea601a7362 100644 --- a/test/integration/targets/filesystem/tasks/main.yml +++ b/test/integration/targets/filesystem/tasks/main.yml @@ -32,4 +32,7 @@ # On Ubuntu trusty, blkid (2.20.1) is unable to identify F2FS filesystem. blkid handles F2FS since v2.23, see: # https://mirrors.edge.kernel.org/pub/linux/utils/util-linux/v2.23/v2.23-ReleaseNotes - 'not (item.key == "f2fs" and ansible_distribution == "Ubuntu" and ansible_distribution_version is version("14.04", "<="))' + # 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) }}" diff --git a/test/integration/targets/filesystem/tasks/setup.yml b/test/integration/targets/filesystem/tasks/setup.yml index e5eff393bd4..2b0946fbb72 100644 --- a/test/integration/targets/filesystem/tasks/setup.yml +++ b/test/integration/targets/filesystem/tasks/setup.yml @@ -2,7 +2,10 @@ package: name: '{{ item }}' state: present - when: ansible_system == 'Linux' or item != 'dosfstools' + # xfsprogs on OpenSUSE requires Python 3, skip this for our newer Py2 OpenSUSE builds + when: + - ansible_system == 'Linux' or item != 'dosfstools' + - 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)