[tests/selinux] pr775-checkpolicy-revdeps: adjust the relevancy of tests failing on centos stream

[tests/selinux] pr775-checkpolicy-revdeps: adjust the relevancy of tests failing on centos stream

[Milos Malik]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : b720e4136743418d7f8aec56c0982c47fb048d28
            Author : Milos Malik <mmalik@redhat.com>
            Date   : 2023-11-02T13:34:21+01:00
            Stats  : +31/-19 in 14 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/b720e4136743418d7f8aec56c0982c47fb048d28?branch=pr775-checkpolicy-revdeps

            Log:
            adjust the relevancy of tests failing on centos stream

Certain tests should not be executed on centos-stream 8 or 9 at all,
because packages required by those tests are not available there.
Certain tests need to reflect the fact that SELinux policies which
confine the tested programs are not present on all versions of RHEL,
CentOS or Fedora.

---
diff --git a/other/mounting/Makefile b/other/mounting/Makefile
index d2bedf4..541f560 100644
--- a/other/mounting/Makefile
+++ b/other/mounting/Makefile
@@ -41,7 +41,6 @@ build: $(BUILT_FILES)
 clean:
 	rm -f *~ $(BUILT_FILES)
 
-
 include /usr/share/rhts/lib/rhts-make.include
 
 $(METADATA): Makefile
@@ -61,6 +60,7 @@ $(METADATA): Makefile
 	@echo "License:         GPLv2+" >> $(METADATA)
 	@echo "Confidential:    no" >> $(METADATA)
 	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5 -RHEL6" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHEL5 -RHEL6" >> $(METADATA)
 
 	rhts-lint $(METADATA)
+

diff --git a/other/mounting/main.fmf b/other/mounting/main.fmf
index a521085..05fb64f 100644
--- a/other/mounting/main.fmf
+++ b/other/mounting/main.fmf
@@ -9,12 +9,11 @@ recommend:
   - e2fsprogs
   - dosfstools
 enabled: true
+duration: 5m
 tag:
   - NoRHEL4
   - NoRHEL5
   - NoRHEL6
-  - TIPfail_Security
-  - failinfedora
   - targeted
 adjust:
   - enabled: false

diff --git a/selinux-policy/anon_inode-and-similar/main.fmf b/selinux-policy/anon_inode-and-similar/main.fmf
index dcefdd9..56e34d1 100644
--- a/selinux-policy/anon_inode-and-similar/main.fmf
+++ b/selinux-policy/anon_inode-and-similar/main.fmf
@@ -36,7 +36,7 @@ link:
   - verifies: https://issues.redhat.com/browse/RHEL-11792
 adjust:
   - enabled: false
-    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-8
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-8, centos-stream-8
     because: the anon_inode class is not defined there
 extra-nitrate: TC#0612643
 extra-summary: /CoreOS/selinux-policy/Regression/anon_inode-and-similar

diff --git a/selinux-policy/anon_inode-and-similar/runtest.sh b/selinux-policy/anon_inode-and-similar/runtest.sh
index 8d83518..583c1ec 100755
--- a/selinux-policy/anon_inode-and-similar/runtest.sh
+++ b/selinux-policy/anon_inode-and-similar/runtest.sh
@@ -69,7 +69,7 @@ rlJournalStart
     rlPhaseEnd
 
     rlPhaseStartTest "mmap on io_uring - bz#2025714 + bz#2187745"
-      if rlIsFedora '<=39' || rlIsRHEL 9 ; then
+      if rlIsFedora '<=39' || rlIsCentOS 9 || rlIsRHEL 9 ; then
         rlSESearchRule "allow unconfined_t unconfined_t : anon_inode { map } [ ]"
         rlSESearchRule "allow svirt_t svirt_t : anon_inode { map } [ ]"
         rlSESearchRule "allow virtd_t virtd_t : anon_inode { map } [ ]"

diff --git a/selinux-policy/bgpd-and-similar/runtest.sh b/selinux-policy/bgpd-and-similar/runtest.sh
index b277dda..9e34785 100755
--- a/selinux-policy/bgpd-and-similar/runtest.sh
+++ b/selinux-policy/bgpd-and-similar/runtest.sh
@@ -34,7 +34,7 @@ FILE_PATH="/usr/sbin/bgpd"
 SERVICE_PACKAGE="openbgpd"
 SERVICE_NAME="bgpd"
 PROCESS_NAME="bgpd"
-if rlIsRHEL 9 ; then
+if rlIsRHEL 9 || rlIsCentOS 9 ; then
     FILE_CONTEXT="bin_t"
     PROCESS_CONTEXT="unconfined_service_t"
 else

diff --git a/selinux-policy/blueman-and-similar/main.fmf b/selinux-policy/blueman-and-similar/main.fmf
index 85dd3bd..54cce32 100644
--- a/selinux-policy/blueman-and-similar/main.fmf
+++ b/selinux-policy/blueman-and-similar/main.fmf
@@ -34,8 +34,8 @@ link:
   - verifies: https://bugzilla.redhat.com/show_bug.cgi?id=2027044
 adjust:
   - enabled: false
-    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-alt-7, rhel-8, rhel-9
-    continue: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-alt-7, rhel-8, rhel-9, centos-stream-8, centos-stream-9
+    because: the blueman package is not available there
 extra-nitrate: TC#0563638
 extra-summary: /CoreOS/selinux-policy/Regression/blueman-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/blueman-and-similar

diff --git a/selinux-policy/bootupd-and-similar/runtest.sh b/selinux-policy/bootupd-and-similar/runtest.sh
index 8a4bf07..f639e12 100755
--- a/selinux-policy/bootupd-and-similar/runtest.sh
+++ b/selinux-policy/bootupd-and-similar/runtest.sh
@@ -34,12 +34,12 @@ FILE_PATH="/usr/libexec/bootupd"
 SERVICE_PACKAGE="bootupd"
 SERVICE_NAME="bootupd"
 PROCESS_NAME="bootupd"
-if rlIsRHEL 9 ; then
-    FILE_CONTEXT="bin_t"
-    PROCESS_CONTEXT="unconfined_service_t"
-else
+if rlIsFedora ; then
     FILE_CONTEXT="bootupd_exec_t"
     PROCESS_CONTEXT="bootupd_t"
+else
+    FILE_CONTEXT="bin_t"
+    PROCESS_CONTEXT="unconfined_service_t"
 fi
 
 rlJournalStart

diff --git a/selinux-policy/fedora-third-party-and-similar/main.fmf b/selinux-policy/fedora-third-party-and-similar/main.fmf
index 580deeb..0c79aa7 100644
--- a/selinux-policy/fedora-third-party-and-similar/main.fmf
+++ b/selinux-policy/fedora-third-party-and-similar/main.fmf
@@ -38,8 +38,8 @@ link:
   - verifies: https://bugzilla.redhat.com/show_bug.cgi?id=2093453
 adjust:
   - enabled: false
-    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-8, rhel-9
-    continue: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-8, rhel-9, centos-stream-8, centos-stream-9
+    because: the fedora-third-party package is not available there
 extra-summary: /CoreOS/selinux-policy/Regression/fedora-third-party-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/fedora-third-party-and-similar
 extra-nitrate: TC#0614304

diff --git a/selinux-policy/icecast-and-similar/main.fmf b/selinux-policy/icecast-and-similar/main.fmf
index d00767c..9802ffb 100644
--- a/selinux-policy/icecast-and-similar/main.fmf
+++ b/selinux-policy/icecast-and-similar/main.fmf
@@ -40,6 +40,9 @@ adjust:
   - enabled: false
     when: distro >= rhel-8
     because: the icecast package is not available there
+  - enabled: false
+    when: distro == centos-stream-8, centos-stream-9
+    because: the icecast package is not available there
 extra-nitrate: TC#0388472
 extra-summary: /CoreOS/selinux-policy/Regression/icecast-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/icecast-and-similar

diff --git a/selinux-policy/ladvd/main.fmf b/selinux-policy/ladvd/main.fmf
index b691e9b..891c560 100644
--- a/selinux-policy/ladvd/main.fmf
+++ b/selinux-policy/ladvd/main.fmf
@@ -30,7 +30,7 @@ link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1855163
 adjust:
   - enabled: false
-    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-8, rhel-9
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-8, rhel-9, centos-stream-8, centos-stream-9
     because: the ladvd package is not available there
 extra-summary: /CoreOS/selinux-policy/Regression/ladvd
 extra-task: /CoreOS/selinux-policy/Regression/ladvd

diff --git a/selinux-policy/sslh-and-similar/main.fmf b/selinux-policy/sslh-and-similar/main.fmf
index 1196043..4b3bd3e 100644
--- a/selinux-policy/sslh-and-similar/main.fmf
+++ b/selinux-policy/sslh-and-similar/main.fmf
@@ -38,6 +38,9 @@ adjust:
     when: distro >= rhel-9
     because: the sslh package is not available there
   - enabled: false
+    when: distro == centos-stream-9
+    because: the sslh package is not available there
+  - enabled: false
     when: arch == i386, ppc, s390, s390x
     because: the sslh package is not available for all architectures
 extra-nitrate: TC#0563428

diff --git a/selinux-policy/systemd-userdbd-and-similar/main.fmf b/selinux-policy/systemd-userdbd-and-similar/main.fmf
index 0764213..c8d9998 100644
--- a/selinux-policy/systemd-userdbd-and-similar/main.fmf
+++ b/selinux-policy/systemd-userdbd-and-similar/main.fmf
@@ -31,14 +31,15 @@ tag:
   - NoRHEL6
   - NoRHEL7
   - NoRHEL8
+  - NoRHEL9
   - failinfedora
   - targeted
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1835630
 adjust:
   - enabled: false
-    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-alt-7, rhel-8, rhel-9
-    continue: false
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-alt-7, rhel-8, rhel-9, centos-stream-8, centos-stream-9
+    because: the systemd-userdbd program is not available there
   - enabled: false
     when: distro == fedora-30, fedora-31
     continue: false

diff --git a/selinux-policy/thttpd-and-similar/main.fmf b/selinux-policy/thttpd-and-similar/main.fmf
index 375dba5..28f74b1 100644
--- a/selinux-policy/thttpd-and-similar/main.fmf
+++ b/selinux-policy/thttpd-and-similar/main.fmf
@@ -39,7 +39,10 @@ link:
 adjust:
   - enabled: false
     when: distro == rhel-4, rhel-alt-7, rhel-9
-    continue: false
+    because: the thttpd package is not available there
+  - enabled: false
+    when: distro == centos-stream-9
+    because: the thttpd package is not available there
   - enabled: false
     when: arch == i386, ppc64, s390
     continue: false

diff --git a/selinux-policy/usbmuxd-and-similar/main.fmf b/selinux-policy/usbmuxd-and-similar/main.fmf
index d32863b..2301b51 100644
--- a/selinux-policy/usbmuxd-and-similar/main.fmf
+++ b/selinux-policy/usbmuxd-and-similar/main.fmf
@@ -46,6 +46,9 @@ adjust:
     when: distro >= rhel-9
     because: the usbmuxd package is not available there
   - enabled: false
+    when: distro == centos-stream-9
+    because: the usbmuxd package is not available there
+  - enabled: false
     when: arch == aarch64, s390x
     continue: false
 extra-nitrate: TC#0300434