From 596ec7fafed07a350675eac0675732d567561edf Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Dec 15 2020 11:38:32 +0000 Subject: Make all relevancy expressions use comparison operators Rather than enumerating RHEL versions, use comparison against "known-good" version to make the expressions easier to read and understand. Also convert users of '~<' to '<', as '~<' compares only minor versions within the same major. Signed-off-by: Ondrej Mosnacek --- diff --git a/kernel/labeled-cephfs/main.fmf b/kernel/labeled-cephfs/main.fmf index d9b5c20..3d3c68e 100644 --- a/kernel/labeled-cephfs/main.fmf +++ b/kernel/labeled-cephfs/main.fmf @@ -7,4 +7,4 @@ duration: 30m tier: 2 adjust: - enabled: false - when: distro ~< rhel-8 + when: distro < rhel-8 diff --git a/kernel/selinux-testsuite/main.fmf b/kernel/selinux-testsuite/main.fmf index a4320ac..358efb6 100644 --- a/kernel/selinux-testsuite/main.fmf +++ b/kernel/selinux-testsuite/main.fmf @@ -7,4 +7,4 @@ duration: 60m tier: 2 adjust: - enabled: false - when: distro ~= rhel-4 + when: distro < rhel-5 diff --git a/libselinux/python-bindings/main.fmf b/libselinux/python-bindings/main.fmf index 0cf282c..03cdc91 100644 --- a/libselinux/python-bindings/main.fmf +++ b/libselinux/python-bindings/main.fmf @@ -5,4 +5,4 @@ description: | tries to use selinux python module in a simple operation adjust: - enabled: false - when: distro ~= rhel-4, rhel-5, rhel-6, rhel-7 + when: distro < rhel-8 diff --git a/libselinux/validatetrans/main.fmf b/libselinux/validatetrans/main.fmf index b9e0c82..a23f02f 100644 --- a/libselinux/validatetrans/main.fmf +++ b/libselinux/validatetrans/main.fmf @@ -1,4 +1,4 @@ path: /libselinux/validatetrans adjust: - enabled: false - when: distro ~< fedora-32 + when: distro < fedora-32 diff --git a/libsemanage/usepasswd-in-semanage-conf/main.fmf b/libsemanage/usepasswd-in-semanage-conf/main.fmf index cb359e3..7cd455b 100644 --- a/libsemanage/usepasswd-in-semanage-conf/main.fmf +++ b/libsemanage/usepasswd-in-semanage-conf/main.fmf @@ -3,4 +3,4 @@ summary: Make sure usepasswd option in semanage.conf works properly tier: 2 adjust: - enabled: false - when: distro ~= rhel-4, rhel-5, rhel-6 + when: distro < rhel-7 diff --git a/libsemanage/verify-options-in-semanage-conf/main.fmf b/libsemanage/verify-options-in-semanage-conf/main.fmf index 9ad2f98..9444a6c 100644 --- a/libsemanage/verify-options-in-semanage-conf/main.fmf +++ b/libsemanage/verify-options-in-semanage-conf/main.fmf @@ -9,4 +9,4 @@ description: | tier: 1 adjust: - enabled: false - when: distro ~= rhel-4, rhel-5 + when: distro < rhel-6 diff --git a/other/mounting/main.fmf b/other/mounting/main.fmf index 2026e6b..bf52899 100644 --- a/other/mounting/main.fmf +++ b/other/mounting/main.fmf @@ -6,4 +6,4 @@ description: | e2fsprogs and dosfstools. adjust: - enabled: false - when: distro ~= rhel-4, rhel-5, rhel-6 + when: distro < rhel-7 diff --git a/policycoreutils/booleans/main.fmf b/policycoreutils/booleans/main.fmf index 0ac3229..2b7a3ac 100644 --- a/policycoreutils/booleans/main.fmf +++ b/policycoreutils/booleans/main.fmf @@ -6,4 +6,4 @@ description: | tier: 1 adjust: - enabled: false - when: distro ~= rhel-4, rhel-5, rhel-6 + when: distro < rhel-7 diff --git a/policycoreutils/file-contexts/main.fmf b/policycoreutils/file-contexts/main.fmf index f7bd0d4..4c27a2c 100644 --- a/policycoreutils/file-contexts/main.fmf +++ b/policycoreutils/file-contexts/main.fmf @@ -5,4 +5,4 @@ description: | contexts. The chcon command is also tested. adjust: - enabled: false - when: distro ~= rhel-4, rhel-5, rhel-6 + when: distro < rhel-7 diff --git a/policycoreutils/fixfiles-F-B-N/main.fmf b/policycoreutils/fixfiles-F-B-N/main.fmf index ee089ff..70e58e3 100644 --- a/policycoreutils/fixfiles-F-B-N/main.fmf +++ b/policycoreutils/fixfiles-F-B-N/main.fmf @@ -4,4 +4,4 @@ description: | Run fixfiles with -F and -B options and check /.autorelabel adjust: - enabled: false - when: distro ~= rhel-4, rhel-5, rhel-6 + when: distro < rhel-7 diff --git a/policycoreutils/modules/main.fmf b/policycoreutils/modules/main.fmf index 0850df4..dc4e4a5 100644 --- a/policycoreutils/modules/main.fmf +++ b/policycoreutils/modules/main.fmf @@ -9,4 +9,4 @@ description: | duration: 10m adjust: - enabled: false - when: distro ~= rhel-4, rhel-5, rhel-6 + when: distro < rhel-7 diff --git a/policycoreutils/org-selinux-dbus-interfaces/main.fmf b/policycoreutils/org-selinux-dbus-interfaces/main.fmf index d84e7b1..8ecc4af 100644 --- a/policycoreutils/org-selinux-dbus-interfaces/main.fmf +++ b/policycoreutils/org-selinux-dbus-interfaces/main.fmf @@ -6,4 +6,4 @@ component: - policycoreutils adjust: - enabled: false - when: distro ~= rhel-4, rhel-5, rhel-6, rhel-7 + when: distro < rhel-8 diff --git a/policycoreutils/restorecond_pointer_abuse/main.fmf b/policycoreutils/restorecond_pointer_abuse/main.fmf index b4ad6f3..d96f84a 100644 --- a/policycoreutils/restorecond_pointer_abuse/main.fmf +++ b/policycoreutils/restorecond_pointer_abuse/main.fmf @@ -14,4 +14,4 @@ component: - policycoreutils adjust: - enabled: false - when: distro ~= rhel-4, rhel-5, rhel-6 + when: distro < rhel-7 diff --git a/policycoreutils/sctp_test/main.fmf b/policycoreutils/sctp_test/main.fmf index 947cdde..dad2354 100644 --- a/policycoreutils/sctp_test/main.fmf +++ b/policycoreutils/sctp_test/main.fmf @@ -9,4 +9,4 @@ component: - libsemanage adjust: - enabled: false - when: distro ~= rhel-4, rhel-5, rhel-6, rhel-7 + when: distro < rhel-8 diff --git a/policycoreutils/selinux-info/main.fmf b/policycoreutils/selinux-info/main.fmf index 6a51e1d..a3a9057 100644 --- a/policycoreutils/selinux-info/main.fmf +++ b/policycoreutils/selinux-info/main.fmf @@ -6,4 +6,4 @@ description: | setenforce. adjust: - enabled: false - when: distro ~= rhel-4, rhel-5, rhel-6 + when: distro < rhel-7 diff --git a/selinux-policy/ladvd/main.fmf b/selinux-policy/ladvd/main.fmf index c13263a..4e8b1a5 100644 --- a/selinux-policy/ladvd/main.fmf +++ b/selinux-policy/ladvd/main.fmf @@ -5,4 +5,4 @@ description: | test suite primarily verifies two bugs ie bz1834325 and bz1855163. adjust: - enabled: false - when: distro ~<= rhel-8 + when: distro <= rhel-8 diff --git a/selinux-policy/nfsdcld-and-similar/main.fmf b/selinux-policy/nfsdcld-and-similar/main.fmf index 8747588..5dbc685 100644 --- a/selinux-policy/nfsdcld-and-similar/main.fmf +++ b/selinux-policy/nfsdcld-and-similar/main.fmf @@ -2,4 +2,4 @@ path: /selinux-policy/nfsdcld-and-similar tier: 2 adjust: - enabled: false - when: distro ~= rhel-4, rhel-5, rhel-6, rhel-7 + when: distro < rhel-8 diff --git a/selinux-policy/rsyslog-and-similar/main.fmf b/selinux-policy/rsyslog-and-similar/main.fmf index aee711d..5e28009 100644 --- a/selinux-policy/rsyslog-and-similar/main.fmf +++ b/selinux-policy/rsyslog-and-similar/main.fmf @@ -5,4 +5,4 @@ description: | verify related SELinux AVC issues. adjust: - enabled: false - when: distro ~= rhel-4, rhel-5, rhel-6, rhel-7 + when: distro < rhel-8 diff --git a/selinux-policy/systemd-homed/main.fmf b/selinux-policy/systemd-homed/main.fmf index 8fa3435..2858935 100644 --- a/selinux-policy/systemd-homed/main.fmf +++ b/selinux-policy/systemd-homed/main.fmf @@ -7,4 +7,4 @@ description: | covers command homectl with its subcommands and checks for avc denials. adjust: - enabled: false - when: distro ~= rhel-4, rhel-5, rhel-6, rhel-7, rhel-8 + when: distro < rhel-9 diff --git a/selinux-policy/systemd-userdbd-and-similar/main.fmf b/selinux-policy/systemd-userdbd-and-similar/main.fmf index 9b578d9..40c698a 100644 --- a/selinux-policy/systemd-userdbd-and-similar/main.fmf +++ b/selinux-policy/systemd-userdbd-and-similar/main.fmf @@ -2,4 +2,4 @@ path: /selinux-policy/systemd-userdbd-and-similar tier: 2 adjust: - enabled: false - when: distro ~<= rhel-8 + when: distro <= rhel-8 diff --git a/selinux-policy/tlp-and-similar/main.fmf b/selinux-policy/tlp-and-similar/main.fmf index 5ca1c95..3e91f57 100644 --- a/selinux-policy/tlp-and-similar/main.fmf +++ b/selinux-policy/tlp-and-similar/main.fmf @@ -5,4 +5,4 @@ description: | programs. adjust: - enabled: false - when: distro ~= rhel-4, rhel-5, rhel-6 + when: distro < rhel-7 diff --git a/selinux-policy/usbguard-daemon-and-similar/main.fmf b/selinux-policy/usbguard-daemon-and-similar/main.fmf index cdd8feb..1b207f2 100644 --- a/selinux-policy/usbguard-daemon-and-similar/main.fmf +++ b/selinux-policy/usbguard-daemon-and-similar/main.fmf @@ -2,4 +2,4 @@ path: /selinux-policy/usbguard-daemon-and-similar tier: 2 adjust: - enabled: false - when: distro ~= rhel-4, rhel-5, rhel-6 + when: distro < rhel-7