public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [tests/selinux] pr775-checkpolicy-revdeps: fix test relevancy and add test IDs
@ 2026-09-11 13:20 Milos Malik
  0 siblings, 0 replies; only message in thread
From: Milos Malik @ 2026-09-11 13:20 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 482173eb71edd644250d4e4b288c8c864097aa41
            Author : Milos Malik <mmalik@redhat.com>
            Date   : 2023-09-12T14:25:05+02:00
            Stats  : +54/-39 in 32 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/482173eb71edd644250d4e4b288c8c864097aa41?branch=pr775-checkpolicy-revdeps

            Log:
            fix test relevancy and add test IDs

Certain test phases are not relevant for RHEL-8 and they fail because
of that fact.

Certain tests still require the setools package, which
is not really needed for their successful run.

Many tests lack the FMF (generated) ID.

Several tests still contain the TIPfail tags (related to the Test
Improvement Project which was discontinued a long time ago).

These issues should be fixed now.

---
diff --git a/selinux-policy/acpid-and-similar/Makefile b/selinux-policy/acpid-and-similar/Makefile
index 8abefeb..b7df294 100644
--- a/selinux-policy/acpid-and-similar/Makefile
+++ b/selinux-policy/acpid-and-similar/Makefile
@@ -55,7 +55,7 @@ $(METADATA): Makefile
 	@echo "TestTime:        30m" >> $(METADATA)
 	@echo "RunFor:          selinux-policy" >> $(METADATA)
 	@echo "RunFor:          acpid" >> $(METADATA)
-	@echo "Requires:        audit libselinux libselinux-utils policycoreutils selinux-policy selinux-policy-targeted setools setools-console acpid initscripts" >> $(METADATA)
+	@echo "Requires:        audit libselinux libselinux-utils policycoreutils selinux-policy selinux-policy-targeted setools-console acpid /usr/sbin/service" >> $(METADATA)
 	@echo "RhtsRequires:    library(selinux-policy/common)" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)

diff --git a/selinux-policy/acpid-and-similar/main.fmf b/selinux-policy/acpid-and-similar/main.fmf
index cb45cc1..0f177b6 100644
--- a/selinux-policy/acpid-and-similar/main.fmf
+++ b/selinux-policy/acpid-and-similar/main.fmf
@@ -15,17 +15,15 @@ recommend:
   - policycoreutils
   - selinux-policy
   - selinux-policy-targeted
-  - setools
   - setools-console
   - acpid
-  - initscripts
+  - /usr/sbin/service
 environment:
     AVC_ERROR: +no_avc_check
 duration: 30m
 enabled: true
 tag:
   - NoRHEL4
-  - TIPfail_infra
   - TIPpass
   - TIPpass_Security
   - Tier2
@@ -52,3 +50,4 @@ adjust:
 extra-nitrate: TC#0075209
 extra-summary: /CoreOS/selinux-policy/Regression/acpid-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/acpid-and-similar
+id: beec2e51-5acf-4d66-aa05-dc183fbb7b46

diff --git a/selinux-policy/bgpd-and-similar/main.fmf b/selinux-policy/bgpd-and-similar/main.fmf
index 9fe25a1..43c39f5 100644
--- a/selinux-policy/bgpd-and-similar/main.fmf
+++ b/selinux-policy/bgpd-and-similar/main.fmf
@@ -43,3 +43,4 @@ adjust:
 extra-nitrate: TC#0613221
 extra-summary: /CoreOS/selinux-policy/Regression/bgpd-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/bgpd-and-similar
+id: b6f956b3-645b-440b-ac06-f8cdb1f8fe80

diff --git a/selinux-policy/bgpd-and-similar/runtest.sh b/selinux-policy/bgpd-and-similar/runtest.sh
index 6dd2698..b277dda 100755
--- a/selinux-policy/bgpd-and-similar/runtest.sh
+++ b/selinux-policy/bgpd-and-similar/runtest.sh
@@ -79,9 +79,18 @@ rlJournalStart
 
     rlPhaseStartTest "real scenario -- standalone service"
         rlRun "sed -i 's/^\(include.*\)$/# \1/' /etc/bgpd.conf"
+        if rlIsRHEL 8 ; then
+            # work around BZ#1830170 that was closed as WONTFIX
+            rlRun "chcon -t bin_t /usr/sbin/bgpd"
+            PROCESS_CONTEXT="unconfined_service_t"
+        fi
         rlSEService - ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "start status" 1
         rlRun "restorecon -Rv /run /var -e /var/ARTIFACTS" 0-255
         rlSEService - ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "restart status stop status" 1
+        if rlIsRHEL 8 ; then
+            # work around BZ#1830170 that was closed as WONTFIX
+            rlRun "restorecon -v /usr/sbin/bgpd"
+        fi
     rlPhaseEnd
 
     rlPhaseStartCleanup

diff --git a/selinux-policy/boltd-and-similar/main.fmf b/selinux-policy/boltd-and-similar/main.fmf
index 0b236f2..fc69914 100644
--- a/selinux-policy/boltd-and-similar/main.fmf
+++ b/selinux-policy/boltd-and-similar/main.fmf
@@ -9,7 +9,7 @@ require:
   - library(selinux-policy/common)
 recommend:
   - audit
-  - initscripts
+  - /usr/sbin/service
   - libselinux
   - libselinux-utils
   - policycoreutils
@@ -28,7 +28,6 @@ tag:
   - NoRHEL4
   - NoRHEL5
   - NoRHEL6
-  - TIPfail_Security
   - Tier2
   - Tier2se
   - TierCandidatesPASS
@@ -52,3 +51,4 @@ adjust:
 extra-nitrate: TC#0575292
 extra-summary: /CoreOS/selinux-policy/Regression/boltd-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/boltd-and-similar
+id: 008316f1-35ab-4eb6-9e70-92df795f9254

diff --git a/selinux-policy/bootupd-and-similar/main.fmf b/selinux-policy/bootupd-and-similar/main.fmf
index 57e85bf..9a9b2bf 100644
--- a/selinux-policy/bootupd-and-similar/main.fmf
+++ b/selinux-policy/bootupd-and-similar/main.fmf
@@ -45,3 +45,4 @@ adjust:
 extra-summary: /CoreOS/selinux-policy/Regression/bootupd-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/bootupd-and-similar
 extra-nitrate: TC#0614833
+id: f6f4f1bc-b585-4199-8cde-d72424cadd52

diff --git a/selinux-policy/bz481628-send-msg-to-dbus/Makefile b/selinux-policy/bz481628-send-msg-to-dbus/Makefile
index 06e84fa..3afb08d 100644
--- a/selinux-policy/bz481628-send-msg-to-dbus/Makefile
+++ b/selinux-policy/bz481628-send-msg-to-dbus/Makefile
@@ -54,7 +54,7 @@ $(METADATA): Makefile
 	@echo "TestTime:        10m" >> $(METADATA)
 	@echo "RunFor:          selinux-policy" >> $(METADATA)
 	@echo "RunFor:          dbus" >> $(METADATA)
-	@echo "Requires:        audit libselinux libselinux-utils policycoreutils selinux-policy selinux-policy-targeted setools setools-console expect openssh-clients dbus-daemon shadow-utils" >> $(METADATA)
+	@echo "Requires:        audit libselinux libselinux-utils policycoreutils selinux-policy selinux-policy-targeted /usr/sbin/service setools-console expect openssh-clients dbus-daemon shadow-utils" >> $(METADATA)
 	@echo "RhtsRequires:    library(selinux-policy/common)" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)

diff --git a/selinux-policy/bz481628-send-msg-to-dbus/main.fmf b/selinux-policy/bz481628-send-msg-to-dbus/main.fmf
index efb8889..78afc50 100644
--- a/selinux-policy/bz481628-send-msg-to-dbus/main.fmf
+++ b/selinux-policy/bz481628-send-msg-to-dbus/main.fmf
@@ -15,7 +15,7 @@ recommend:
   - policycoreutils
   - selinux-policy
   - selinux-policy-targeted
-  - setools
+  - /usr/sbin/service
   - setools-console
   - expect
   - openssh-clients
@@ -28,7 +28,6 @@ enabled: true
 tag:
   - CI-Tier-1
   - NoRHEL4
-  - TIPfail_Security
   - TIPpass
   - TierCandidatesPASS
   - failinfedora
@@ -48,3 +47,4 @@ adjust:
 extra-nitrate: TC#0057414
 extra-summary: /CoreOS/selinux-policy/Regression/bz481628-send-msg-to-dbus
 extra-task: /CoreOS/selinux-policy/Regression/bz481628-send-msg-to-dbus
+id: 3d861eff-500e-48d9-bef7-0906a55f5000

diff --git a/selinux-policy/bz562833-chrooted-named-file-contexts/main.fmf b/selinux-policy/bz562833-chrooted-named-file-contexts/main.fmf
index d689936..f3985b3 100644
--- a/selinux-policy/bz562833-chrooted-named-file-contexts/main.fmf
+++ b/selinux-policy/bz562833-chrooted-named-file-contexts/main.fmf
@@ -61,3 +61,4 @@ adjust:
 extra-nitrate: TC#0057489
 extra-summary: /CoreOS/selinux-policy/Regression/bz562833-chrooted-named-file-contexts
 extra-task: /CoreOS/selinux-policy/Regression/bz562833-chrooted-named-file-contexts
+id: dc594e14-f692-4537-9553-ce6aeab1a0cc

diff --git a/selinux-policy/bz624405-pcsc-and-similar/main.fmf b/selinux-policy/bz624405-pcsc-and-similar/main.fmf
index 685536f..5ab5e8d 100644
--- a/selinux-policy/bz624405-pcsc-and-similar/main.fmf
+++ b/selinux-policy/bz624405-pcsc-and-similar/main.fmf
@@ -12,7 +12,7 @@ recommend:
   - audit
   - expect
   - grep
-  - initscripts
+  - /usr/sbin/service
   - libselinux
   - libselinux-utils
   - pcsc-lite
@@ -21,7 +21,6 @@ recommend:
   - selinux-policy
   - selinux-policy-mls
   - selinux-policy-targeted
-  - setools
   - setools-console
 environment:
     AVC_ERROR: +no_avc_check
@@ -59,3 +58,4 @@ adjust:
 extra-nitrate: TC#0057525
 extra-summary: /CoreOS/selinux-policy/Regression/bz624405-pcsc-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/bz624405-pcsc-and-similar
+id: 43cb4c7e-4e58-4b9b-82ea-8c9438ee0030

diff --git a/selinux-policy/capability2-class/main.fmf b/selinux-policy/capability2-class/main.fmf
index 83ff051..5440b4f 100644
--- a/selinux-policy/capability2-class/main.fmf
+++ b/selinux-policy/capability2-class/main.fmf
@@ -25,4 +25,5 @@ adjust:
   - enabled: false
     when: distro = rhel-4, rhel-5, rhel-6, rhel-7, rhel-8
     continue: false
-
+extra-nitrate: TC#0615396
+id: 251fd08a-0f65-4592-8d4d-2b79e9479460

diff --git a/selinux-policy/cups-lpd-and-similar/Makefile b/selinux-policy/cups-lpd-and-similar/Makefile
index c3a0bdd..83fe356 100644
--- a/selinux-policy/cups-lpd-and-similar/Makefile
+++ b/selinux-policy/cups-lpd-and-similar/Makefile
@@ -55,7 +55,7 @@ $(METADATA): Makefile
 	@echo "TestTime:        20m" >> $(METADATA)
 	@echo "RunFor:          selinux-policy" >> $(METADATA)
 	@echo "RunFor:          cups" >> $(METADATA)
-	@echo "Requires:        audit expect policycoreutils-python-utils selinux-policy-devel libselinux libselinux-utils policycoreutils selinux-policy selinux-policy-targeted setools setools-console xinetd nmap-ncat nc net-tools cups-lpd chkconfig /usr/sbin/service" >> $(METADATA)
+	@echo "Requires:        audit expect policycoreutils-python-utils selinux-policy-devel libselinux libselinux-utils policycoreutils selinux-policy selinux-policy-targeted setools-console xinetd nmap-ncat nc net-tools cups-lpd chkconfig /usr/sbin/service" >> $(METADATA)
 	@echo "RhtsRequires:    library(selinux-policy/common)" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)

diff --git a/selinux-policy/cups-lpd-and-similar/main.fmf b/selinux-policy/cups-lpd-and-similar/main.fmf
index ef5985d..a9173d2 100644
--- a/selinux-policy/cups-lpd-and-similar/main.fmf
+++ b/selinux-policy/cups-lpd-and-similar/main.fmf
@@ -35,7 +35,6 @@ tag:
   - RHEL8
   - Tier2
   - Tier2se
-  - TierCandidatesFAIL
   - customer_scenario
   - f32friendly
   - rhel9-buildroot
@@ -58,3 +57,4 @@ adjust:
 extra-nitrate: TC#0305784
 extra-summary: /CoreOS/selinux-policy/Regression/cups-lpd-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/cups-lpd-and-similar
+id: 544f74d0-54a4-4174-a4a0-4fe85190a5c6

diff --git a/selinux-policy/dhcpcd-and-similar/main.fmf b/selinux-policy/dhcpcd-and-similar/main.fmf
index 428d042..bc95e8b 100644
--- a/selinux-policy/dhcpcd-and-similar/main.fmf
+++ b/selinux-policy/dhcpcd-and-similar/main.fmf
@@ -25,7 +25,6 @@ tag:
   - NoRHEL4
   - NoRHEL5
   - NoRHEL6
-  - TIPfail_Security
   - failinfedora
   - targeted
 link:
@@ -38,3 +37,4 @@ adjust:
 extra-nitrate: TC#0574611
 extra-summary: /CoreOS/selinux-policy/Regression/dhcpcd-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/dhcpcd-and-similar
+id: 16f95682-f375-4789-86a5-a59b9d70ff3a

diff --git a/selinux-policy/dmidecode-and-similar/Makefile b/selinux-policy/dmidecode-and-similar/Makefile
index 386e4f3..6de3c03 100644
--- a/selinux-policy/dmidecode-and-similar/Makefile
+++ b/selinux-policy/dmidecode-and-similar/Makefile
@@ -55,7 +55,7 @@ $(METADATA): Makefile
 	@echo "TestTime:        15m" >> $(METADATA)
 	@echo "RunFor:          selinux-policy" >> $(METADATA)
 	@echo "RunFor:          dmidecode" >> $(METADATA)
-	@echo "Requires:        audit libselinux libselinux-utils policycoreutils selinux-policy selinux-policy-targeted setools setools-console dmidecode selinux-policy-devel shadow-utils openssh-clients expect" >> $(METADATA)
+	@echo "Requires:        audit libselinux libselinux-utils policycoreutils selinux-policy selinux-policy-targeted setools-console dmidecode selinux-policy-devel shadow-utils openssh-clients expect" >> $(METADATA)
 	@echo "RhtsRequires:    library(selinux-policy/common)" >> $(METADATA)
 	@echo "Environment:     AVC_ERROR=+no_avc_check" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)

diff --git a/selinux-policy/dmidecode-and-similar/main.fmf b/selinux-policy/dmidecode-and-similar/main.fmf
index 659e4f9..3c7d84d 100644
--- a/selinux-policy/dmidecode-and-similar/main.fmf
+++ b/selinux-policy/dmidecode-and-similar/main.fmf
@@ -15,7 +15,6 @@ recommend:
   - policycoreutils
   - selinux-policy
   - selinux-policy-targeted
-  - setools
   - setools-console
   - dmidecode
   - selinux-policy-devel
@@ -32,7 +31,6 @@ tag:
   - TIPpass_Security
   - Tier2
   - Tier2se
-  - TierCandidatesFAIL
   - f31friendly
   - f32friendly
   - targeted
@@ -53,3 +51,4 @@ adjust:
 extra-nitrate: TC#0550595
 extra-summary: /CoreOS/selinux-policy/Regression/dmidecode-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/dmidecode-and-similar
+id: 8b3954c3-5475-4a03-aad9-0a31a68bcdce

diff --git a/selinux-policy/firewalld-and-similar/Makefile b/selinux-policy/firewalld-and-similar/Makefile
index 9938f8f..1912dab 100644
--- a/selinux-policy/firewalld-and-similar/Makefile
+++ b/selinux-policy/firewalld-and-similar/Makefile
@@ -55,7 +55,7 @@ $(METADATA): Makefile
 	@echo "TestTime:        30m" >> $(METADATA)
 	@echo "RunFor:          selinux-policy" >> $(METADATA)
 	@echo "RunFor:          firewalld" >> $(METADATA)
-	@echo "Requires:        audit libselinux libselinux-utils policycoreutils selinux-policy selinux-policy-targeted setools-console firewalld glib2 nftables procps-ng" >> $(METADATA)
+	@echo "Requires:        audit libselinux libselinux-utils policycoreutils selinux-policy selinux-policy-targeted setools-console firewalld glib2 nftables procps-ng /usr/sbin/service" >> $(METADATA)
 	@echo "RhtsRequires:    library(selinux-policy/common)" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)

diff --git a/selinux-policy/firewalld-and-similar/main.fmf b/selinux-policy/firewalld-and-similar/main.fmf
index 3134d71..2eccb4a 100644
--- a/selinux-policy/firewalld-and-similar/main.fmf
+++ b/selinux-policy/firewalld-and-similar/main.fmf
@@ -20,6 +20,7 @@ recommend:
   - glib2
   - nftables
   - procps-ng
+  - /usr/sbin/service
 environment:
     AVC_ERROR: +no_avc_check
 duration: 30m
@@ -29,7 +30,6 @@ tag:
   - NoRHEL5
   - NoRHEL6
   - TIP_fedora_pass
-  - TIPfail_fedora
   - TIPpass
   - TIPpass_FIPS
   - TIPpass_Security
@@ -68,3 +68,4 @@ adjust:
 extra-nitrate: TC#0175059
 extra-summary: /CoreOS/selinux-policy/Regression/firewalld-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/firewalld-and-similar
+id: e856e8cc-0893-457b-a1ef-a71c09b6fef9

diff --git a/selinux-policy/fwupd-and-similar/Makefile b/selinux-policy/fwupd-and-similar/Makefile
index 6f28850..be34447 100644
--- a/selinux-policy/fwupd-and-similar/Makefile
+++ b/selinux-policy/fwupd-and-similar/Makefile
@@ -55,7 +55,7 @@ $(METADATA): Makefile
 	@echo "TestTime:        10m" >> $(METADATA)
 	@echo "RunFor:          fwupd" >> $(METADATA)
 	@echo "RunFor:          selinux-policy" >> $(METADATA)
-	@echo "Requires:        audit libselinux libselinux-utils policycoreutils selinux-policy selinux-policy-targeted setools-console glib2 fwupd initscripts expect" >> $(METADATA)
+	@echo "Requires:        audit libselinux libselinux-utils policycoreutils selinux-policy selinux-policy-targeted setools-console glib2 fwupd /usr/sbin/service expect" >> $(METADATA)
 	@echo "RhtsRequires:    library(selinux-policy/common)" >> $(METADATA)
 	@echo "Environment:     AVC_ERROR=+no_avc_check" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)

diff --git a/selinux-policy/fwupd-and-similar/main.fmf b/selinux-policy/fwupd-and-similar/main.fmf
index 1017ddb..26be6e8 100644
--- a/selinux-policy/fwupd-and-similar/main.fmf
+++ b/selinux-policy/fwupd-and-similar/main.fmf
@@ -18,7 +18,7 @@ recommend:
   - setools-console
   - glib2
   - fwupd
-  - initscripts
+  - /usr/sbin/service
   - expect
 environment:
     AVC_ERROR: +no_avc_check
@@ -30,8 +30,6 @@ tag:
   - NoRHEL4
   - NoRHEL5
   - NoRHEL6
-  - TIPfail
-  - TIPfail_Security
   - Tier3
   - Tier3se
   - TierCandidatesPASS
@@ -53,3 +51,4 @@ adjust:
 extra-nitrate: TC#0563429
 extra-summary: /CoreOS/selinux-policy/Regression/fwupd-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/fwupd-and-similar
+id: 12996742-5ad6-4dd2-b04d-b4c781fcce79

diff --git a/selinux-policy/numad-and-similar/main.fmf b/selinux-policy/numad-and-similar/main.fmf
index fd55273..8b20c53 100644
--- a/selinux-policy/numad-and-similar/main.fmf
+++ b/selinux-policy/numad-and-similar/main.fmf
@@ -11,14 +11,13 @@ recommend:
   - audit
   - expect
   - grep
-  - initscripts
+  - /usr/sbin/service
   - libselinux
   - libselinux-utils
   - numad
   - policycoreutils
   - procps
   - selinux-policy
-  - setools
   - setools-console
 environment:
     AVC_ERROR: +no_avc_check
@@ -51,3 +50,4 @@ adjust:
 extra-nitrate: TC#0202428
 extra-summary: /CoreOS/selinux-policy/Regression/numad-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/numad-and-similar
+id: f97f6046-ee73-48ec-b3fc-7aa08648890c

diff --git a/selinux-policy/pam_console-and-related/main.fmf b/selinux-policy/pam_console-and-related/main.fmf
index 24e1f45..dad130b 100644
--- a/selinux-policy/pam_console-and-related/main.fmf
+++ b/selinux-policy/pam_console-and-related/main.fmf
@@ -35,7 +35,6 @@ tag:
   - NoRHEL4
   - NoRHEL5
   - NoRHEL6
-  - TIPfail
   - TIPpass_Security
   - failinfedora
   - targeted
@@ -50,3 +49,4 @@ adjust:
 extra-nitrate: TC#0606229
 extra-summary: /CoreOS/selinux-policy/Regression/pam_console-and-related
 extra-task: /CoreOS/selinux-policy/Regression/pam_console-and-related
+id: 622adb1b-d20a-4418-8646-3aaecd35a1e2

diff --git a/selinux-policy/pcp-daemons-and-similar/Makefile b/selinux-policy/pcp-daemons-and-similar/Makefile
index 7367625..a7216d7 100644
--- a/selinux-policy/pcp-daemons-and-similar/Makefile
+++ b/selinux-policy/pcp-daemons-and-similar/Makefile
@@ -55,7 +55,7 @@ $(METADATA): Makefile
 	@echo "TestTime:        90m" >> $(METADATA)
 	@echo "RunFor:          selinux-policy" >> $(METADATA)
 	@echo "RunFor:          pcp" >> $(METADATA)
-	@echo "Requires:        audit libselinux libselinux-utils policycoreutils selinux-policy selinux-policy-targeted setools setools-console glib2 pcp pcp-manager pcp-pmda-dm pcp-webapi" >> $(METADATA)
+	@echo "Requires:        audit libselinux libselinux-utils policycoreutils selinux-policy selinux-policy-targeted /usr/sbin/service setools-console glib2 pcp pcp-manager pcp-pmda-dm pcp-webapi" >> $(METADATA)
 	@echo "RhtsRequires:    library(selinux-policy/common)" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)
 	@echo "License:         GPLv2" >> $(METADATA)

diff --git a/selinux-policy/pcp-daemons-and-similar/main.fmf b/selinux-policy/pcp-daemons-and-similar/main.fmf
index fa32730..26a4295 100644
--- a/selinux-policy/pcp-daemons-and-similar/main.fmf
+++ b/selinux-policy/pcp-daemons-and-similar/main.fmf
@@ -15,7 +15,7 @@ recommend:
   - policycoreutils
   - selinux-policy
   - selinux-policy-targeted
-  - setools
+  - /usr/sbin/service
   - setools-console
   - glib2
   - pcp
@@ -28,7 +28,6 @@ duration: 90m
 enabled: true
 tag:
   - NoRHEL4
-  - TIPfail_FIPS
   - TIPpass
   - TIPpass_Security
   - TipWaived7
@@ -66,3 +65,4 @@ adjust:
 extra-nitrate: TC#0075517
 extra-summary: /CoreOS/selinux-policy/Regression/pcp-daemons-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/pcp-daemons-and-similar
+id: e59269a3-9556-4441-b60b-2339499689b7

diff --git a/selinux-policy/perf_event-and-related/main.fmf b/selinux-policy/perf_event-and-related/main.fmf
index 2241095..0382ccc 100644
--- a/selinux-policy/perf_event-and-related/main.fmf
+++ b/selinux-policy/perf_event-and-related/main.fmf
@@ -42,3 +42,4 @@ adjust:
 extra-nitrate: TC#0609306
 extra-summary: /CoreOS/selinux-policy/Regression/perf_event-and-related
 extra-task: /CoreOS/selinux-policy/Regression/perf_event-and-related
+id: 3efbd0b9-bc20-4b7a-a253-3bec809d323a

diff --git a/selinux-policy/perf_event-and-related/runtest.sh b/selinux-policy/perf_event-and-related/runtest.sh
index 944ee91..61f8021 100755
--- a/selinux-policy/perf_event-and-related/runtest.sh
+++ b/selinux-policy/perf_event-and-related/runtest.sh
@@ -64,9 +64,11 @@ rlJournalStart
         rlSESearchRule "allow sysadm_t sysadm_t : perf_event { open cpu kernel read write } [ ]"
     rlPhaseEnd
 
+    if ! rlIsRHEL 8 ; then
     rlPhaseStartTest "bz#2229936"
         rlSESearchRule "allow sysadm_t kernel_t : bpf { prog_run } [ ]"
     rlPhaseEnd
+    fi
 
     rlPhaseStartTest "real scenario -- perf tool under root"
         rlRun "perf record -o /dev/null echo test"

diff --git a/selinux-policy/rsyslog-and-similar/main.fmf b/selinux-policy/rsyslog-and-similar/main.fmf
index 0603f76..17a3970 100644
--- a/selinux-policy/rsyslog-and-similar/main.fmf
+++ b/selinux-policy/rsyslog-and-similar/main.fmf
@@ -10,7 +10,7 @@ require:
   - library(selinux-policy/common)
 recommend:
   - audit
-  - initscripts
+  - /usr/sbin/service
   - libselinux
   - libselinux-utils
   - logwatch
@@ -20,7 +20,6 @@ recommend:
   - rsyslog-gnutls
   - selinux-policy
   - selinux-policy-targeted
-  - setools
   - setools-console
   - shadow-utils
   - /usr/sbin/semanage
@@ -41,3 +40,4 @@ adjust:
 extra-nitrate: TC#0609007
 extra-summary: /CoreOS/selinux-policy/Regression/rsyslog-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/rsyslog-and-similar
+id: 42688797-d2d6-4acc-acd2-dc54f18150c4

diff --git a/selinux-policy/rtkit-daemon-and-similar/main.fmf b/selinux-policy/rtkit-daemon-and-similar/main.fmf
index 1cba664..9e25d45 100644
--- a/selinux-policy/rtkit-daemon-and-similar/main.fmf
+++ b/selinux-policy/rtkit-daemon-and-similar/main.fmf
@@ -9,7 +9,7 @@ require:
   - library(selinux-policy/common)
 recommend:
   - audit
-  - initscripts
+  - /usr/sbin/service
   - libselinux
   - libselinux-utils
   - policycoreutils
@@ -26,8 +26,6 @@ tag:
   - CI-Tier-1
   - NoRHEL4
   - NoRHEL5
-  - TIP_fedora_fail
-  - TIPfail
   - TIPpass_FIPS
   - TIPpass_Security
   - Tier2
@@ -57,3 +55,4 @@ adjust:
 extra-nitrate: TC#0300678
 extra-summary: /CoreOS/selinux-policy/Regression/rtkit-daemon-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/rtkit-daemon-and-similar
+id: 9c4bfed2-36f7-4f37-ac14-629721ab5934

diff --git a/selinux-policy/sslh-and-similar/Makefile b/selinux-policy/sslh-and-similar/Makefile
index 7a8ea3d..7740655 100644
--- a/selinux-policy/sslh-and-similar/Makefile
+++ b/selinux-policy/sslh-and-similar/Makefile
@@ -54,7 +54,7 @@ $(METADATA): Makefile
 	@echo "Type:            Regression" >> $(METADATA)
 	@echo "TestTime:        10m" >> $(METADATA)
 	@echo "RunFor:          selinux-policy" >> $(METADATA)
-	@echo "Requires:        audit libselinux libselinux-utils policycoreutils selinux-policy selinux-policy-targeted setools setools-console sslh initscripts" >> $(METADATA)
+	@echo "Requires:        audit libselinux libselinux-utils policycoreutils selinux-policy selinux-policy-targeted setools-console sslh /usr/sbin/service" >> $(METADATA)
 	@echo "RhtsRequires:    library(selinux-policy/common)" >> $(METADATA)
 	@echo "Environment:     AVC_ERROR=+no_avc_check" >> $(METADATA)
 	@echo "Priority:        Normal" >> $(METADATA)

diff --git a/selinux-policy/sslh-and-similar/main.fmf b/selinux-policy/sslh-and-similar/main.fmf
index 82f44cc..b718239 100644
--- a/selinux-policy/sslh-and-similar/main.fmf
+++ b/selinux-policy/sslh-and-similar/main.fmf
@@ -14,10 +14,9 @@ recommend:
   - policycoreutils
   - selinux-policy
   - selinux-policy-targeted
-  - setools
   - setools-console
   - sslh
-  - initscripts
+  - /usr/sbin/service
 environment:
     AVC_ERROR: +no_avc_check
 duration: 10m
@@ -43,3 +42,4 @@ adjust:
 extra-nitrate: TC#0563428
 extra-summary: /CoreOS/selinux-policy/Regression/sslh-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/sslh-and-similar
+id: da6c2b1a-6db2-4c2b-b258-311438d26aef

diff --git a/selinux-policy/systemd-machined-and-similar/main.fmf b/selinux-policy/systemd-machined-and-similar/main.fmf
index dc0ec37..b757c0d 100644
--- a/selinux-policy/systemd-machined-and-similar/main.fmf
+++ b/selinux-policy/systemd-machined-and-similar/main.fmf
@@ -39,3 +39,4 @@ adjust:
 extra-summary: /CoreOS/selinux-policy/Regression/systemd-machined-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/systemd-machined-and-similar
 extra-nitrate: TC#0614355
+id: 3aff16de-7ca9-41eb-9676-9c2236fc92f1

diff --git a/selinux-policy/watch-permissions/main.fmf b/selinux-policy/watch-permissions/main.fmf
index 9d37a3d..5969989 100644
--- a/selinux-policy/watch-permissions/main.fmf
+++ b/selinux-policy/watch-permissions/main.fmf
@@ -25,4 +25,5 @@ adjust:
   - enabled: false
     when: distro = rhel-4, rhel-5, rhel-6, rhel-7, rhel-8
     continue: false
-
+extra-nitrate: TC#0615395
+id: c4421242-0b97-4a1e-abbb-1dbe5dd21355

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-09-11 13:20 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-11 13:20 [tests/selinux] pr775-checkpolicy-revdeps: fix test relevancy and add test IDs Milos Malik

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox