[tests/selinux] pr775-checkpolicy-revdeps: update test relevancy based on packages availability

[tests/selinux] pr775-checkpolicy-revdeps: update test relevancy based on packages availability

[Milos Malik]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 15f6d6c6120515c177bf2434d3534f864ddac0ac
            Author : Milos Malik <mmalik@redhat.com>
            Date   : 2020-12-15T11:53:28+01:00
            Stats  : +76/-49 in 23 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/15f6d6c6120515c177bf2434d3534f864ddac0ac?branch=pr775-checkpolicy-revdeps

            Log:
            update test relevancy based on packages availability

Relevancy changes are made based on recommendations from:
  tmt test lint --fix

Some packages are available for Fedoras only and are not available
for RHELs at all.
Some packages are available for latest RHEL major versions only.

---
diff --git a/kernel/labeled-cephfs/main.fmf b/kernel/labeled-cephfs/main.fmf
index 28f1b7a..d9b5c20 100644
--- a/kernel/labeled-cephfs/main.fmf
+++ b/kernel/labeled-cephfs/main.fmf
@@ -4,6 +4,7 @@ summary: Test for correct CephFS SELinux labeling
 description: |
     This TC verifies that CephFS security label support works as expected.
 duration: 30m
-relevancy:
-    - "distro < rhel-8: False"
 tier: 2
+adjust:
+-   enabled: false
+    when: distro ~< rhel-8

diff --git a/kernel/selinux-testsuite/main.fmf b/kernel/selinux-testsuite/main.fmf
index 12e0013..a4320ac 100644
--- a/kernel/selinux-testsuite/main.fmf
+++ b/kernel/selinux-testsuite/main.fmf
@@ -4,6 +4,7 @@ summary: Wrapper for selinux-testuite
 description: |
     This TC runs a functional test suite for the LSM-based SELinux security module.
 duration: 60m
-relevancy:
-    - "distro = rhel-4: False"
 tier: 2
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4

diff --git a/libselinux/python-bindings/main.fmf b/libselinux/python-bindings/main.fmf
index 7481198..0cf282c 100644
--- a/libselinux/python-bindings/main.fmf
+++ b/libselinux/python-bindings/main.fmf
@@ -3,5 +3,6 @@ summary: Import selinux python module, check its metadata
 description: |
     The test compares rpm version with python module metadata version and
     tries to use selinux python module in a simple operation
-relevancy:
-    - "distro = rhel-4, rhel-5, rhel-6: rhel-7: False"
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5, rhel-6, rhel-7

diff --git a/libselinux/validatetrans/main.fmf b/libselinux/validatetrans/main.fmf
index 886443b..b9e0c82 100644
--- a/libselinux/validatetrans/main.fmf
+++ b/libselinux/validatetrans/main.fmf
@@ -1,4 +1,4 @@
 path: /libselinux/validatetrans
-relevancy:
-- "distro < fedora-32: False"
-
+adjust:
+-   enabled: false
+    when: distro ~< fedora-32

diff --git a/libsemanage/usepasswd-in-semanage-conf/main.fmf b/libsemanage/usepasswd-in-semanage-conf/main.fmf
index 7e14f6d..cb359e3 100644
--- a/libsemanage/usepasswd-in-semanage-conf/main.fmf
+++ b/libsemanage/usepasswd-in-semanage-conf/main.fmf
@@ -1,5 +1,6 @@
 path: /libsemanage/usepasswd-in-semanage-conf
 summary: Make sure usepasswd option in semanage.conf works properly
-relevancy:
-    - "distro = rhel-4, rhel-5, rhel-6: False"
 tier: 2
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5, rhel-6

diff --git a/libsemanage/verify-options-in-semanage-conf/main.fmf b/libsemanage/verify-options-in-semanage-conf/main.fmf
index ac156f4..9ad2f98 100644
--- a/libsemanage/verify-options-in-semanage-conf/main.fmf
+++ b/libsemanage/verify-options-in-semanage-conf/main.fmf
@@ -6,8 +6,7 @@ description: |
     Tested tools: semodule, semanage
     Positive and negative cases are tested.
     Original information found at http://selinuxproject.org/page/PolicyValidate
-relevancy:
-    - "distro = rhel-4, rhel-5: False"
 tier: 1
-
-#requires+: [libsemanage]
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5

diff --git a/other/mounting/main.fmf b/other/mounting/main.fmf
index a695b6f..2026e6b 100644
--- a/other/mounting/main.fmf
+++ b/other/mounting/main.fmf
@@ -4,5 +4,6 @@ description: |
     Test the context and defcontext options of the mount command. Test
     different filesystems: ext2, ext3, ext4. XFS, FAT32. Requires
     e2fsprogs and dosfstools.
-relevancy:
-    - "distro = rhel-4, rhel-5, rhel-6: False"
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5, rhel-6

diff --git a/policycoreutils/booleans/main.fmf b/policycoreutils/booleans/main.fmf
index 642a947..0ac3229 100644
--- a/policycoreutils/booleans/main.fmf
+++ b/policycoreutils/booleans/main.fmf
@@ -3,6 +3,7 @@ summary: Test basic operations with booleans
 description: |
     The test defines its own booleans and tests setting it on and off
     using setsebool and semanage boolean.
-relevancy:
-    - "distro = rhel-4, rhel-5, rhel-6: False"
 tier: 1
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5, rhel-6

diff --git a/policycoreutils/file-contexts/main.fmf b/policycoreutils/file-contexts/main.fmf
index ea7225a..f7bd0d4 100644
--- a/policycoreutils/file-contexts/main.fmf
+++ b/policycoreutils/file-contexts/main.fmf
@@ -3,5 +3,6 @@ summary: Test semanage fcontext, restorecon, fixfiles, chcon
 description: |
     The test adds custom file contexts, runs restorecon and checks file
     contexts. The chcon command is also tested.
-relevancy:
-    - "distro = rhel-4, rhel-5, rhel-6: False"
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5, rhel-6

diff --git a/policycoreutils/fixfiles-F-B-N/main.fmf b/policycoreutils/fixfiles-F-B-N/main.fmf
index b49ad4a..ee089ff 100644
--- a/policycoreutils/fixfiles-F-B-N/main.fmf
+++ b/policycoreutils/fixfiles-F-B-N/main.fmf
@@ -2,5 +2,6 @@ path: /policycoreutils/fixfiles-F-B-N
 summary: Test fixfiles [-F] [-B] onboot
 description: |
     Run fixfiles with -F and -B options and check /.autorelabel             
-relevancy:
-    - "distro = rhel-4, rhel-5, rhel-6: False"
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5, rhel-6

diff --git a/policycoreutils/modules/main.fmf b/policycoreutils/modules/main.fmf
index 3b5d389..0850df4 100644
--- a/policycoreutils/modules/main.fmf
+++ b/policycoreutils/modules/main.fmf
@@ -6,6 +6,7 @@ description: |
     Module overriding using priorities and module disabling is also
     tested. This test requires policycoreutils and selinux-policy-devel
     packages.
-relevancy:
-    - "distro = rhel-4, rhel-5, rhel-6: False"
 duration: 10m
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5, rhel-6

diff --git a/policycoreutils/org-selinux-dbus-interfaces/main.fmf b/policycoreutils/org-selinux-dbus-interfaces/main.fmf
index b916480..d84e7b1 100644
--- a/policycoreutils/org-selinux-dbus-interfaces/main.fmf
+++ b/policycoreutils/org-selinux-dbus-interfaces/main.fmf
@@ -2,7 +2,8 @@ path: /policycoreutils/org-selinux-dbus-interfaces
 summary: Do the D-bus interfaces/methods of /org/selinux/object work as expected?
 description: |
     Do the D-bus interfaces/methods of /org/selinux/object work as expected?
-relevancy:
-    - "distro = rhel-4, rhel-5, rhel-6, rhel-7: False"
-component: [ policycoreutils ]
-#requires: [ policycoreutils-dbus, selinux-policy-targeted]
+component:
+- policycoreutils
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5, rhel-6, rhel-7

diff --git a/policycoreutils/restorecond_pointer_abuse/main.fmf b/policycoreutils/restorecond_pointer_abuse/main.fmf
index f7d412a..b4ad6f3 100644
--- a/policycoreutils/restorecond_pointer_abuse/main.fmf
+++ b/policycoreutils/restorecond_pointer_abuse/main.fmf
@@ -10,7 +10,8 @@ description: |
     this test may result in SUCESS even if the issue being tested is present!
 
     Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1626468
-relevancy:
-    - "distro = rhel-4, rhel-5, rhel-6: False"
-component: [ policycoreutils ]
-#requires: [/usr/sbin/restorecond, /usr/bin/chcon, /usr/sbin/sestatus, /usr/bin/systemctl, /usr/bin/journalctl]
+component:
+- policycoreutils
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5, rhel-6

diff --git a/policycoreutils/sctp_test/main.fmf b/policycoreutils/sctp_test/main.fmf
index 73a8bd9..947cdde 100644
--- a/policycoreutils/sctp_test/main.fmf
+++ b/policycoreutils/sctp_test/main.fmf
@@ -4,7 +4,9 @@ description: |
     Simulates a use case where a user wants to confine a client-server application communicating over SCTP
     Bug summary: semanage port does not support SCTP protocol
     Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1563742
-relevancy:
-    - "distro = rhel-4, rhel-5, rhel-6, rhel-7: False"
-component: [ policycoreutils, libsemanage ]
-#requires: [/usr/sbin/semanage, /usr/sbin/semodule, lksctp-tools, psmisc]
+component:
+- policycoreutils
+- libsemanage
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5, rhel-6, rhel-7

diff --git a/policycoreutils/selinux-info/main.fmf b/policycoreutils/selinux-info/main.fmf
index 4ce0eb4..6a51e1d 100644
--- a/policycoreutils/selinux-info/main.fmf
+++ b/policycoreutils/selinux-info/main.fmf
@@ -4,5 +4,6 @@ description: |
     Test that output of sestatus matches information in /sys/fs/selinux.
     Test that avcstat works. Test getenforce. Warning: this tests runs
     setenforce.
-relevancy:
-    - "distro = rhel-4, rhel-5, rhel-6: False"
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5, rhel-6

diff --git a/selinux-policy/ladvd/main.fmf b/selinux-policy/ladvd/main.fmf
index aeab96e..c13263a 100644
--- a/selinux-policy/ladvd/main.fmf
+++ b/selinux-policy/ladvd/main.fmf
@@ -3,3 +3,6 @@ summary: Test ladvd utility to verify AVC denials
 description: |
     Test coverage for SELinux AVC issues related ladvd service. This
     test suite primarily verifies two bugs ie bz1834325 and bz1855163. 
+adjust:
+-   enabled: false
+    when: distro ~<= rhel-8

diff --git a/selinux-policy/nfsdcld-and-similar/main.fmf b/selinux-policy/nfsdcld-and-similar/main.fmf
index 3a31c7a..8747588 100644
--- a/selinux-policy/nfsdcld-and-similar/main.fmf
+++ b/selinux-policy/nfsdcld-and-similar/main.fmf
@@ -1,3 +1,5 @@
 path: /selinux-policy/nfsdcld-and-similar
 tier: 2
-
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5, rhel-6, rhel-7

diff --git a/selinux-policy/rsyslog-and-similar/main.fmf b/selinux-policy/rsyslog-and-similar/main.fmf
index 621f154..aee711d 100644
--- a/selinux-policy/rsyslog-and-similar/main.fmf
+++ b/selinux-policy/rsyslog-and-similar/main.fmf
@@ -3,6 +3,6 @@ summary: Test rsyslog service and verify AVC denials
 description: |
     Test coverage for rsyslog service with different configurations and 
     verify related SELinux AVC issues.
-relevancy:
-    - "distro = rhel-4, rhel-5, rhel-6, rhel-7: False"
- 
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5, rhel-6, rhel-7

diff --git a/selinux-policy/systemd-homed/main.fmf b/selinux-policy/systemd-homed/main.fmf
index e39d0e5..8fa3435 100644
--- a/selinux-policy/systemd-homed/main.fmf
+++ b/selinux-policy/systemd-homed/main.fmf
@@ -5,6 +5,6 @@ description: |
     service. The homectl program calls the systemd-homed service, which 
     is not yet confined, but it triggers SELinux denials. This test suite
     covers command homectl with its subcommands and checks for avc denials.
-relevancy:
-    - "distro = rhel-4, rhel-5, rhel-6, rhel-7: False"
-
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5, rhel-6, rhel-7, rhel-8

diff --git a/selinux-policy/systemd-rfkill-and-similar/main.fmf b/selinux-policy/systemd-rfkill-and-similar/main.fmf
index 02f0a3d..ecc2671 100644
--- a/selinux-policy/systemd-rfkill-and-similar/main.fmf
+++ b/selinux-policy/systemd-rfkill-and-similar/main.fmf
@@ -1,2 +1,5 @@
 path: /selinux-policy/systemd-rfkill-and-similar
 tier: 2
+adjust:
+-   enabled: false
+    when: distro ~>= fedora-32

diff --git a/selinux-policy/systemd-userdbd-and-similar/main.fmf b/selinux-policy/systemd-userdbd-and-similar/main.fmf
index 23213c1..9b578d9 100644
--- a/selinux-policy/systemd-userdbd-and-similar/main.fmf
+++ b/selinux-policy/systemd-userdbd-and-similar/main.fmf
@@ -1,5 +1,5 @@
 path: /selinux-policy/systemd-userdbd-and-similar
 tier: 2
-relevancy:
-- "distro <= rhel-8: False"
-
+adjust:
+-   enabled: false
+    when: distro ~<= rhel-8

diff --git a/selinux-policy/tlp-and-similar/main.fmf b/selinux-policy/tlp-and-similar/main.fmf
index 46dac8a..5ca1c95 100644
--- a/selinux-policy/tlp-and-similar/main.fmf
+++ b/selinux-policy/tlp-and-similar/main.fmf
@@ -3,3 +3,6 @@ summary: SELinux interferes with tlp and related programs
 description: |
     Test coverage for SELinux AVC issues against tlp and related
     programs. 
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5, rhel-6

diff --git a/selinux-policy/usbguard-daemon-and-similar/main.fmf b/selinux-policy/usbguard-daemon-and-similar/main.fmf
index a2efdf1..cdd8feb 100644
--- a/selinux-policy/usbguard-daemon-and-similar/main.fmf
+++ b/selinux-policy/usbguard-daemon-and-similar/main.fmf
@@ -1,2 +1,5 @@
 path: /selinux-policy/usbguard-daemon-and-similar
 tier: 2
+adjust:
+-   enabled: false
+    when: distro ~= rhel-4, rhel-5, rhel-6