[tests/selinux] pr775-checkpolicy-revdeps: update test relevancy to match the expectations

[tests/selinux] pr775-checkpolicy-revdeps: update test relevancy to match the expectations

[Milos Malik]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 9aa71766546e68a0160190a01857521ce885b920
            Author : Milos Malik <mmalik@redhat.com>
            Date   : 2024-07-19T13:30:29+02:00
            Stats  : +14/-5 in 7 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/9aa71766546e68a0160190a01857521ce885b920?branch=pr775-checkpolicy-revdeps

            Log:
            update test relevancy to match the expectations

Certain test phases or tests are not relevant for CentOS stream 9.

---
diff --git a/libselinux/matchpathcon-in-chroot-env/runtest.sh b/libselinux/matchpathcon-in-chroot-env/runtest.sh
index e273569..e8c82b7 100755
--- a/libselinux/matchpathcon-in-chroot-env/runtest.sh
+++ b/libselinux/matchpathcon-in-chroot-env/runtest.sh
@@ -32,6 +32,8 @@ PACKAGE="libselinux"
 CHROOT_DIR=`mktemp -d`
 if rlIsFedora ; then
     INSTALL_OPTION="--use-host-config"
+else
+    INSTALL_OPTION="--disablerepo epel"
 fi
 
 rlJournalStart

diff --git a/selinux-policy/bootupd-and-similar/runtest.sh b/selinux-policy/bootupd-and-similar/runtest.sh
index 5e61d7b..7746e1a 100755
--- a/selinux-policy/bootupd-and-similar/runtest.sh
+++ b/selinux-policy/bootupd-and-similar/runtest.sh
@@ -34,7 +34,7 @@ FILE_PATH="/usr/libexec/bootupd"
 SERVICE_PACKAGE="bootupd"
 SERVICE_NAME="bootupd"
 PROCESS_NAME="bootupd"
-if rlIsFedora || rlIsRHEL '>= 9.5' || rlIsRHEL '>= 10' || rlIsCentOS '>= 10' ; then
+if seinfo -t | grep -q bootupd ; then
     FILE_CONTEXT="bootupd_exec_t"
     PROCESS_CONTEXT="bootupd_t"
 else
@@ -82,6 +82,7 @@ rlJournalStart
         rlSESearchRule "allow ${PROCESS_CONTEXT} efivarfs_t : dir { getattr search } [ ]"
     rlPhaseEnd
 
+    if [ -f /usr/lib/systemd/system/bootupd.service ] ; then
     rlPhaseStartTest "real scenario -- standalone service"
         if ! rlSEDefined ${PROCESS_CONTEXT} ; then
             # for OSes where the SELinux domain does not exist yet
@@ -93,7 +94,9 @@ rlJournalStart
         rlSEService - ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "restart status stop status" 1
         rlRun "systemctl stop ${SERVICE_NAME}.socket"
     rlPhaseEnd
+    fi
 
+    if [ -f /usr/lib/systemd/system/bootupd.socket ] ; then
     rlPhaseStartTest "real scenario -- ${SERVICE_NAME}.socket"
         rlRun "systemctl enable ${SERVICE_NAME}.socket"
         rlRun "systemctl start ${SERVICE_NAME}.socket"
@@ -104,6 +107,7 @@ rlJournalStart
         rlRun "systemctl stop ${SERVICE_NAME}.socket"
         rlRun "systemctl disable ${SERVICE_NAME}.socket"
     rlPhaseEnd
+    fi
 
     rlPhaseStartCleanup
         sleep 2

diff --git a/selinux-policy/kernel-confined-exec/main.fmf b/selinux-policy/kernel-confined-exec/main.fmf
index 4f71f34..e2c42b9 100644
--- a/selinux-policy/kernel-confined-exec/main.fmf
+++ b/selinux-policy/kernel-confined-exec/main.fmf
@@ -22,6 +22,9 @@ adjust:
     when: distro < fedora-38
     because: This hardening applies only to F38+
   - enabled: false
+    when: distro < centos-stream-10
+    because: Not yet backported to CentOS
+  - enabled: false
     when: distro < rhel-10
     because: Not yet backported to RHEL
 link:

diff --git a/selinux-policy/logwatch-and-similar/runtest.sh b/selinux-policy/logwatch-and-similar/runtest.sh
index fe1de30..4632ee2 100755
--- a/selinux-policy/logwatch-and-similar/runtest.sh
+++ b/selinux-policy/logwatch-and-similar/runtest.sh
@@ -59,7 +59,7 @@ rlJournalStart
         rlSESearchRule "allow logwatch_mail_t sysctl_net_t : file { getattr open read } [ ]"
     rlPhaseEnd
 
-    if ! rlIsRHEL 9 ; then
+    if ! rlIsRHEL 9 && ! rlIsCentOS 9 ; then
     rlPhaseStartTest "bz#2270484"
         rlSEMatchPathCon "/usr/share/logwatch/scripts/logwatch.pl" "logwatch_exec_t"
         rlSEMatchPathCon "/usr/sbin/sendmail.sendmail" "sendmail_exec_t"

diff --git a/selinux-policy/sulogin-and-similar/runtest.sh b/selinux-policy/sulogin-and-similar/runtest.sh
index 51a1d85..6fbb8d9 100755
--- a/selinux-policy/sulogin-and-similar/runtest.sh
+++ b/selinux-policy/sulogin-and-similar/runtest.sh
@@ -15,7 +15,7 @@ rlJournalStart
         sleep 2
     rlPhaseEnd
 
-    if ! rlIsRHEL 8 9 ; then
+    if ! rlIsRHEL 8 9 && ! rlIsCentOS 8 9 ; then
     rlPhaseStartTest "bz#2265391"
         rlSEMatchPathCon "/usr/sbin/sulogin" "sulogin_exec_t"
         rlSESearchRule "dontaudit sulogin_t sulogin_t : capability2 { checkpoint_restore } [ ]"

diff --git a/selinux-policy/systemd-nsresourced-and-similar/Makefile b/selinux-policy/systemd-nsresourced-and-similar/Makefile
index 48094f3..b87f21b 100644
--- a/selinux-policy/systemd-nsresourced-and-similar/Makefile
+++ b/selinux-policy/systemd-nsresourced-and-similar/Makefile
@@ -61,7 +61,7 @@ $(METADATA): Makefile
 	@echo "License:         GPLv2" >> $(METADATA)
 	@echo "Confidential:    no" >> $(METADATA)
 	@echo "Destructive:     no" >> $(METADATA)
-	@echo "Releases:        -RHEL4 -RHEL5 -RHEL6 -RHEL7 -RHEL8 -RHEL9" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHEL5 -RHEL6 -RHEL7 -RHEL8 -RHEL9 -RHEL10" >> $(METADATA)
 	@echo "Bug:             2290477" >> $(METADATA) # Fedora 41
 
 	rhts-lint $(METADATA)

diff --git a/selinux-policy/systemd-nsresourced-and-similar/main.fmf b/selinux-policy/systemd-nsresourced-and-similar/main.fmf
index 307d47f..560b247 100644
--- a/selinux-policy/systemd-nsresourced-and-similar/main.fmf
+++ b/selinux-policy/systemd-nsresourced-and-similar/main.fmf
@@ -38,7 +38,7 @@ adjust:
     when: distro <= fedora-40
     continue: false
   - 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, centos-stream-8, rhel-9, centos-stream-9, rhel-10, centos-stream-10
     continue: false
 extra-summary: /CoreOS/selinux-policy/Regression/systemd-nsresourced-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/systemd-nsresourced-and-similar