From 14a1199dfcdf2fc02796132c431bcf6d2b0f138e Mon Sep 17 00:00:00 2001 From: Adam Miller Date: Tue, 20 Nov 2018 14:50:04 -0600 Subject: [PATCH] update/enable filesystem integration test target for rhel8 beta Signed-off-by: Adam Miller --- test/integration/targets/filesystem/aliases | 1 - test/integration/targets/filesystem/tasks/main.yml | 1 + test/integration/targets/filesystem/tasks/setup.yml | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/integration/targets/filesystem/aliases b/test/integration/targets/filesystem/aliases index a045eb215f..7c04127209 100644 --- a/test/integration/targets/filesystem/aliases +++ b/test/integration/targets/filesystem/aliases @@ -1,4 +1,3 @@ destructive shippable/posix/group3 skip/osx -skip/rhel8.0 diff --git a/test/integration/targets/filesystem/tasks/main.yml b/test/integration/targets/filesystem/tasks/main.yml index 69e806599f..fb6904d15c 100644 --- a/test/integration/targets/filesystem/tasks/main.yml +++ b/test/integration/targets/filesystem/tasks/main.yml @@ -26,6 +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.0.key == "btrfs" and (ansible_distribution == "Ubuntu" and ansible_distribution_release == "trusty"))' + - 'not (item.0.key == "btrfs" and (ansible_distribution == "RedHat" and ansible_distribution_major_version|int >= 8))' - 'not (item.0.key == "lvm" and ansible_system == "FreeBSD")' # LVM not available on FreeBSD - 'not (item.0.key == "lvm" and ansible_virtualization_type == "docker")' # Tests use losetup which can not be used inside unprivileged container - 'not (item.0.key == "ocfs2" and ansible_os_family != "Debian")' # ocfs2 only available on Debian based distributions diff --git a/test/integration/targets/filesystem/tasks/setup.yml b/test/integration/targets/filesystem/tasks/setup.yml index 70c9479ad2..796e7d3ab0 100644 --- a/test/integration/targets/filesystem/tasks/setup.yml +++ b/test/integration/targets/filesystem/tasks/setup.yml @@ -15,6 +15,7 @@ - ansible_os_family != 'Suse' - not (ansible_distribution == 'Ubuntu' and ansible_distribution_version is version('16.04', '<=')) - ansible_system != "FreeBSD" + - not (ansible_distribution == "RedHat" and ansible_distribution_major_version|int >= 8) - name: install btrfs progs (Ubuntu <= 16.04) package: