public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Milos Malik <mmalik@redhat.com>
To: git-commits@fedoraproject.org
Subject: [tests/selinux] pr775-checkpolicy-revdeps: exclude unsuitable tests from image mode testing
Date: Fri, 11 Sep 2026 13:23:20 GMT	[thread overview]
Message-ID: <178913300055.1.15292952556221639064.tests-selinux-1eb61b3a69e6@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 1eb61b3a69e617572829ec483a384b36a41be23a
            Author : Milos Malik <mmalik@redhat.com>
            Date   : 2025-09-26T14:45:52+02:00
            Stats  : +82/-18 in 57 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/1eb61b3a69e617572829ec483a384b36a41be23a?branch=pr775-checkpolicy-revdeps

            Log:
            exclude unsuitable tests from image mode testing

Tests which are not suitable (various reasons) for image mode
testing will get the avoidImageMode tag. If their conditions improve,
the tag can be removed.

---
diff --git a/kernel/labeled-cephfs/main.fmf b/kernel/labeled-cephfs/main.fmf
index c25a15c..e4e3ded 100644
--- a/kernel/labeled-cephfs/main.fmf
+++ b/kernel/labeled-cephfs/main.fmf
@@ -7,6 +7,7 @@ duration: 30m
 tier: 2
 tag:
   - failinfedora
+  - avoidImageMode
 adjust:
 -   enabled: false
     when: distro < rhel-8

diff --git a/kernel/ocontext-race/main.fmf b/kernel/ocontext-race/main.fmf
index 8add542..2748fbd 100644
--- a/kernel/ocontext-race/main.fmf
+++ b/kernel/ocontext-race/main.fmf
@@ -23,3 +23,5 @@ extra-hardware: |
 link:
 - verifies: https://bugzilla.redhat.com/show_bug.cgi?id=1969344
 - verifies: https://bugzilla.redhat.com/show_bug.cgi?id=2040196
+tag:
+  - avoidImageMode

diff --git a/kernel/xfrm-refcount-underflow/main.fmf b/kernel/xfrm-refcount-underflow/main.fmf
index 3d3be6f..b0db0ea 100644
--- a/kernel/xfrm-refcount-underflow/main.fmf
+++ b/kernel/xfrm-refcount-underflow/main.fmf
@@ -7,6 +7,8 @@ contact: Ondrej Mosnacek <omosnace@redhat.com>
 component:
   - kernel
 framework: beakerlib
+recommend:
+  - systemtap
 duration: 15m
 tier: 2
 enabled: true

diff --git a/libsemanage/semanage-root-on-nfs/main.fmf b/libsemanage/semanage-root-on-nfs/main.fmf
index 5a4de5b..e4bf5a7 100644
--- a/libsemanage/semanage-root-on-nfs/main.fmf
+++ b/libsemanage/semanage-root-on-nfs/main.fmf
@@ -9,6 +9,7 @@ duration: 10m
 enabled: true
 tag:
   - NoRHIVOS
+  - avoidImageMode
 link:
   - verifies: https://issues.redhat.com/browse/RHEL-60503
 extra-nitrate: TC#0617969

diff --git a/libsemanage/semanage-seuser-functions/main.fmf b/libsemanage/semanage-seuser-functions/main.fmf
index be3d129..0924387 100644
--- a/libsemanage/semanage-seuser-functions/main.fmf
+++ b/libsemanage/semanage-seuser-functions/main.fmf
@@ -19,6 +19,7 @@ tag:
   - f33friendly
   - rhel8-buildroot
   - targeted
+  - avoidImageMode
 adjust:
   - enabled: false
     when: distro == rhel-4, rhel-5

diff --git a/libsemanage/usepasswd-in-semanage-conf/main.fmf b/libsemanage/usepasswd-in-semanage-conf/main.fmf
index 3a32954..55d9502 100644
--- a/libsemanage/usepasswd-in-semanage-conf/main.fmf
+++ b/libsemanage/usepasswd-in-semanage-conf/main.fmf
@@ -22,6 +22,7 @@ tag:
   - NoRHEL4
   - NoRHEL5
   - targeted
+  - avoidImageMode
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1871786
 adjust:

diff --git a/libsepol/sepol_check_context/main.fmf b/libsepol/sepol_check_context/main.fmf
index 81de590..0f0a82b 100644
--- a/libsepol/sepol_check_context/main.fmf
+++ b/libsepol/sepol_check_context/main.fmf
@@ -19,6 +19,7 @@ tag:
   - f32friendly
   - f33friendly
   - targeted
+  - avoidImageMode
 tier: 1
 adjust:
   - enabled: false

diff --git a/mcstrans/internal-examples-testsuite/main.fmf b/mcstrans/internal-examples-testsuite/main.fmf
index 85aea97..0ee1be6 100644
--- a/mcstrans/internal-examples-testsuite/main.fmf
+++ b/mcstrans/internal-examples-testsuite/main.fmf
@@ -26,6 +26,7 @@ tag:
   - f32friendly
   - f33friendly
   - targeted
+  - avoidImageMode
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1656304
 adjust:

diff --git a/other/collect-denials/main.fmf b/other/collect-denials/main.fmf
index 61b0c0d..6d6aa03 100644
--- a/other/collect-denials/main.fmf
+++ b/other/collect-denials/main.fmf
@@ -10,3 +10,4 @@ duration: 5m
 enabled: true
 tag:
  - failinfedora
+ - avoidImageMode

diff --git a/other/update-packages/main.fmf b/other/update-packages/main.fmf
index 2c54741..179a2e4 100644
--- a/other/update-packages/main.fmf
+++ b/other/update-packages/main.fmf
@@ -4,4 +4,5 @@ test: ./runtest.sh
 framework: beakerlib
 duration: 15m
 enabled: true
-
+tag:
+  - avoidImageMode

diff --git a/policycoreutils/fixfiles-F-B-N/main.fmf b/policycoreutils/fixfiles-F-B-N/main.fmf
index be30bd5..ace6639 100644
--- a/policycoreutils/fixfiles-F-B-N/main.fmf
+++ b/policycoreutils/fixfiles-F-B-N/main.fmf
@@ -6,3 +6,5 @@ component:
 extra-summary: /CoreOS/policycoreutils/Sanity/fixfiles-F-B-N
 extra-task: /CoreOS/policycoreutils/Sanity/fixfiles-F-B-N
 id: d70961fa-6c8b-442d-9706-c8ef47969685
+tag:
+  - avoidImageMode

diff --git a/policycoreutils/linux-system-roles.selinux-tests/main.fmf b/policycoreutils/linux-system-roles.selinux-tests/main.fmf
index 73aaefc..6498f6d 100644
--- a/policycoreutils/linux-system-roles.selinux-tests/main.fmf
+++ b/policycoreutils/linux-system-roles.selinux-tests/main.fmf
@@ -12,6 +12,7 @@ recommend:
 duration: 40m
 tag:
   - NoRHIVOS
+  - avoidImageMode
 extra-summary: linux-system-roles.selinux-tests
 extra-task: linux-system-roles.selinux-tests
 id: 4889350b-d9fa-4cbf-86ff-f16a1c729f9e

diff --git a/policycoreutils/load_policy/main.fmf b/policycoreutils/load_policy/main.fmf
index 391e40d..764cadc 100644
--- a/policycoreutils/load_policy/main.fmf
+++ b/policycoreutils/load_policy/main.fmf
@@ -22,6 +22,7 @@ tag:
   - f33friendly
   - failinrhel8ci
   - targeted
+  - avoidImageMode
 tier: 1
 adjust:
   - enabled: false

diff --git a/policycoreutils/org-selinux-dbus-interfaces/main.fmf b/policycoreutils/org-selinux-dbus-interfaces/main.fmf
index a9f924f..93c052d 100644
--- a/policycoreutils/org-selinux-dbus-interfaces/main.fmf
+++ b/policycoreutils/org-selinux-dbus-interfaces/main.fmf
@@ -21,6 +21,7 @@ tag:
   - f32friendly
   - f33friendly
   - targeted
+  - avoidImageMode
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1415988
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1754873

diff --git a/policycoreutils/python-module-precedence-issue/main.fmf b/policycoreutils/python-module-precedence-issue/main.fmf
index 7564e9e..b3c1807 100644
--- a/policycoreutils/python-module-precedence-issue/main.fmf
+++ b/policycoreutils/python-module-precedence-issue/main.fmf
@@ -20,6 +20,7 @@ tag:
   - f32friendly
   - f33friendly
   - targeted
+  - avoidImageMode
 tier: 1
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=2128976

diff --git a/policycoreutils/restorecon/main.fmf b/policycoreutils/restorecon/main.fmf
index 75f61cb..e20ff1f 100644
--- a/policycoreutils/restorecon/main.fmf
+++ b/policycoreutils/restorecon/main.fmf
@@ -36,6 +36,7 @@ tag:
   - f31friendly
   - f32friendly
   - targeted
+  - avoidImageMode
 tier: 1
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=739587

diff --git a/policycoreutils/restorecond_pointer_abuse/main.fmf b/policycoreutils/restorecond_pointer_abuse/main.fmf
index 7a6d450..4dffd53 100644
--- a/policycoreutils/restorecond_pointer_abuse/main.fmf
+++ b/policycoreutils/restorecond_pointer_abuse/main.fmf
@@ -23,3 +23,5 @@ adjust:
   - enabled: false
     when: distro < rhel-7
 id: a900e46c-6cf9-49e1-9625-5beb609760c5
+tag:
+  - avoidImageMode

diff --git a/policycoreutils/sctp_test/main.fmf b/policycoreutils/sctp_test/main.fmf
index 9b5ed69..8b2d0ea 100644
--- a/policycoreutils/sctp_test/main.fmf
+++ b/policycoreutils/sctp_test/main.fmf
@@ -15,3 +15,5 @@ link:
 extra-summary: /selinux/policycoreutils/sctp_test
 extra-task: /selinux/policycoreutils/sctp_test
 extra-nitrate: TC#0614834
+tag:
+  - avoidImageMode

diff --git a/policycoreutils/semanage-interface/main.fmf b/policycoreutils/semanage-interface/main.fmf
index 2229388..adc896b 100644
--- a/policycoreutils/semanage-interface/main.fmf
+++ b/policycoreutils/semanage-interface/main.fmf
@@ -19,8 +19,8 @@ tag:
   - TierCandidatesPASS
   - f32friendly
   - f33friendly
-  - rhel-7.0
   - targeted
+  - avoidImageMode
 tier: 1
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=953826

diff --git a/policycoreutils/semanage-login/main.fmf b/policycoreutils/semanage-login/main.fmf
index 0dbe091..9b56fa1 100644
--- a/policycoreutils/semanage-login/main.fmf
+++ b/policycoreutils/semanage-login/main.fmf
@@ -20,8 +20,8 @@ tag:
   - TierCandidatesPASS
   - f32friendly
   - f33friendly
-  - rhel-7.0
   - targeted
+  - avoidImageMode
 tier: 1
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=953826

diff --git a/policycoreutils/semanage-port-add-delete-problems/main.fmf b/policycoreutils/semanage-port-add-delete-problems/main.fmf
index 43aece3..f9c20d5 100644
--- a/policycoreutils/semanage-port-add-delete-problems/main.fmf
+++ b/policycoreutils/semanage-port-add-delete-problems/main.fmf
@@ -18,3 +18,5 @@ duration: 15m
 extra-summary: /CoreOS/policycoreutils/Regression/semanage-port-add-delete-problems
 extra-task: /CoreOS/policycoreutils/Regression/semanage-port-add-delete-problems
 id: 3db01ce3-7cf2-4f3a-9b71-412d7cd7ce64
+tag:
+  - avoidImageMode

diff --git a/policycoreutils/semanage-user/main.fmf b/policycoreutils/semanage-user/main.fmf
index 5c58c0d..05e6aa5 100644
--- a/policycoreutils/semanage-user/main.fmf
+++ b/policycoreutils/semanage-user/main.fmf
@@ -21,8 +21,8 @@ tag:
   - TierCandidatesPASS
   - f32friendly
   - f33friendly
-  - rhel-7.0
   - targeted
+  - avoidImageMode
 tier: 1
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=953826

diff --git a/policycoreutils/semodule-rebuild-if-modules-changed/runtest.sh b/policycoreutils/semodule-rebuild-if-modules-changed/runtest.sh
index b87505c..2e658ed 100755
--- a/policycoreutils/semodule-rebuild-if-modules-changed/runtest.sh
+++ b/policycoreutils/semodule-rebuild-if-modules-changed/runtest.sh
@@ -7,7 +7,11 @@
 # Include Beakerlib environment
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
-STORE_ROOT=/var/lib/selinux
+if grep -q ^store-root /etc/selinux/semanage.conf
+    STORE_ROOT=`grep ^store-root /etc/selinux/semanage.conf | cut -d = -f 2`
+else
+    STORE_ROOT=/var/lib/selinux
+fi
 STORE_TYPE=targeted
 MODULES_ROOT="$STORE_ROOT/$STORE_TYPE/active/modules"
 STORE_POLICY="$STORE_ROOT/$STORE_TYPE/active/policy.kern"

diff --git a/policycoreutils/sepolicy-generate/main.fmf b/policycoreutils/sepolicy-generate/main.fmf
index 0bc1144..3bd18e5 100644
--- a/policycoreutils/sepolicy-generate/main.fmf
+++ b/policycoreutils/sepolicy-generate/main.fmf
@@ -19,6 +19,7 @@ tag:
   - f31friendly
   - f32friendly
   - targeted
+  - avoidImageMode
 tier: 3
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1271324

diff --git a/policycoreutils/setsebool/main.fmf b/policycoreutils/setsebool/main.fmf
index 8ad08b5..1d0b2b4 100644
--- a/policycoreutils/setsebool/main.fmf
+++ b/policycoreutils/setsebool/main.fmf
@@ -24,6 +24,7 @@ tag:
   - f33friendly
   - failinrhel8ci
   - targeted
+  - avoidImageMode
 tier: 1
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1002529

diff --git a/selinux-policy/blueman-and-similar/main.fmf b/selinux-policy/blueman-and-similar/main.fmf
index 3856db9..39bff7e 100644
--- a/selinux-policy/blueman-and-similar/main.fmf
+++ b/selinux-policy/blueman-and-similar/main.fmf
@@ -37,7 +37,7 @@ 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, centos-stream-8, centos-stream-9
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-alt-7, rhel-8, rhel-9, centos-stream-8, centos-stream-9, rhel-10, centos-stream-10
     because: the blueman package is not available there
 extra-nitrate: TC#0563638
 extra-summary: /CoreOS/selinux-policy/Regression/blueman-and-similar

diff --git a/selinux-policy/boothd-and-similar/main.fmf b/selinux-policy/boothd-and-similar/main.fmf
index 446a168..3e43139 100644
--- a/selinux-policy/boothd-and-similar/main.fmf
+++ b/selinux-policy/boothd-and-similar/main.fmf
@@ -31,6 +31,7 @@ tag:
   - NoRHEL7
   - targeted
   - NoRHIVOS
+  - avoidImageMode
 link:
   - verifies: https://issues.redhat.com/browse/RHEL-45907
   - verifies: https://issues.redhat.com/browse/RHEL-57104

diff --git a/selinux-policy/bootupd-and-similar/main.fmf b/selinux-policy/bootupd-and-similar/main.fmf
index cbd16ae..d892f6e 100644
--- a/selinux-policy/bootupd-and-similar/main.fmf
+++ b/selinux-policy/bootupd-and-similar/main.fmf
@@ -29,6 +29,7 @@ tag:
   - NoRHEL8
   - targeted
   - NoRHIVOS
+  - avoidImageMode
 tier: 3
 link:
   - verifies: https://bugzilla.redhat.com/show_bug.cgi?id=2029478

diff --git a/selinux-policy/bz562833-chrooted-named-file-contexts/main.fmf b/selinux-policy/bz562833-chrooted-named-file-contexts/main.fmf
index 1dc4a23..5ecc85f 100644
--- a/selinux-policy/bz562833-chrooted-named-file-contexts/main.fmf
+++ b/selinux-policy/bz562833-chrooted-named-file-contexts/main.fmf
@@ -33,6 +33,7 @@ tag:
   - f32friendly
   - targeted
   - NoRHIVOS
+  - avoidImageMode
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=451970
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=562833

diff --git a/selinux-policy/caddy-and-similar/main.fmf b/selinux-policy/caddy-and-similar/main.fmf
index be06a73..57f9b9c 100644
--- a/selinux-policy/caddy-and-similar/main.fmf
+++ b/selinux-policy/caddy-and-similar/main.fmf
@@ -28,6 +28,7 @@ tag:
   - rhel8-epel
   - rhel9-epel
   - NoRHIVOS
+  - avoidImageMode
 adjust:
   - enabled: false
     when: distro == rhel-4, rhel-5, rhel-6, rhel-7, centos-stream-10, rhel-10

diff --git a/selinux-policy/cups-pdf-and-similar/main.fmf b/selinux-policy/cups-pdf-and-similar/main.fmf
index f83fbee..2589357 100644
--- a/selinux-policy/cups-pdf-and-similar/main.fmf
+++ b/selinux-policy/cups-pdf-and-similar/main.fmf
@@ -36,6 +36,7 @@ tag:
   - rhel8-epel
   - rhel9-epel
   - NoRHIVOS
+  - avoidImageMode
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=560220
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=563977

diff --git a/selinux-policy/deny-rules/runtest.sh b/selinux-policy/deny-rules/runtest.sh
index 3464738..2fb86c6 100755
--- a/selinux-policy/deny-rules/runtest.sh
+++ b/selinux-policy/deny-rules/runtest.sh
@@ -118,12 +118,12 @@ rlJournalStart
         rlRun "echo -e '( deny ${USER_TYPE} ${USER_TYPE} ( system ( module_load module_request )))' > testpolicy.cil"
         rlRun "echo -e '( deny kmod_t kmod_t ( system ( module_load module_request )))' >> testpolicy.cil"
         rlRun "echo -e '( deny kmod_t modules_object_t ( system ( module_load )))' >> testpolicy.cil"
-	rlRun "semodule -i testpolicy.cil"
+        rlRun "semodule -i testpolicy.cil"
         rlRun "semodule -lfull | grep testpolicy"
         rlRun -s "./ssh.exp ${USER_NAME} ${USER_SECRET} localhost modprobe dummy"
         rlRun "grep -i 'permission denied' $rlRun_LOG"
         rm -f $rlRun_LOG
-        rlRun "lsmod | grep dummy" 1
+        rlRun "lsmod | grep ^dummy" 1
         rlRun "semodule -r testpolicy"
         rlRun "modprobe dummy"
         rlRun "lsmod | grep dummy"

diff --git a/selinux-policy/dhcpcd-and-similar/main.fmf b/selinux-policy/dhcpcd-and-similar/main.fmf
index 6592423..b2cbd84 100644
--- a/selinux-policy/dhcpcd-and-similar/main.fmf
+++ b/selinux-policy/dhcpcd-and-similar/main.fmf
@@ -28,6 +28,7 @@ tag:
   - NoRHEL6
   - targeted
   - NoRHIVOS
+  - avoidImageMode
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1585971
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1602343

diff --git a/selinux-policy/exim-and-similar/main.fmf b/selinux-policy/exim-and-similar/main.fmf
index a16d8f5..e480e0a 100644
--- a/selinux-policy/exim-and-similar/main.fmf
+++ b/selinux-policy/exim-and-similar/main.fmf
@@ -37,6 +37,7 @@ tag:
   - rhel9-epel
   - rhel10-epel
   - NoRHIVOS
+  - avoidImageMode
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1025315
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1444441

diff --git a/selinux-policy/hostapd-and-similar/main.fmf b/selinux-policy/hostapd-and-similar/main.fmf
index aa3ac7a..8879021 100644
--- a/selinux-policy/hostapd-and-similar/main.fmf
+++ b/selinux-policy/hostapd-and-similar/main.fmf
@@ -32,6 +32,7 @@ tag:
   - failinfedora
   - targeted
   - NoRHIVOS
+  - avoidImageMode
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1224405
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1225245

diff --git a/selinux-policy/iio-sensor-proxy-and-similar/runtest.sh b/selinux-policy/iio-sensor-proxy-and-similar/runtest.sh
index 041e959..224e218 100755
--- a/selinux-policy/iio-sensor-proxy-and-similar/runtest.sh
+++ b/selinux-policy/iio-sensor-proxy-and-similar/runtest.sh
@@ -56,7 +56,7 @@ rlJournalStart
         rlRun "rpm -qf ${FILE_PATH}"
 
         rlServiceStop ${SERVICE_NAME}
-        rlFileBackup /usr/lib/systemd/system/iio-sensor-proxy.service
+        rlFileBackup /etc/systemd/system/iio-sensor-proxy.service
         rlServiceStart gdm
 
         rlSESetEnforce
@@ -76,11 +76,12 @@ rlJournalStart
 
     if [ -f /usr/lib/systemd/system/${SERVICE_NAME}.service ] ; then
     rlPhaseStartTest "real scenario -- standalone service"
-        rlRun "sed -i 's/^.*Environment=.*$/Environment=FAKE_COMPASS=1/' /usr/lib/systemd/system/iio-sensor-proxy.service"
+        rlRun "cp -f /usr/lib/systemd/system/iio-sensor-proxy.service /etc/systemd/system/"
+        rlRun "sed -i 's/^.*Environment=.*$/Environment=FAKE_COMPASS=1/' /etc/systemd/system/iio-sensor-proxy.service"
         rlRun "systemctl daemon-reload"
         rlSEService - ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "start status" 1
         rlRun "restorecon -Rv /etc /run /var -e /var/ARTIFACTS" 0-255
-        rlRun "sed -i 's/^.*Environment=.*$/Environment=FAKE_LIGHT_SENSOR=1/' /usr/lib/systemd/system/iio-sensor-proxy.service"
+        rlRun "sed -i 's/^.*Environment=.*$/Environment=FAKE_LIGHT_SENSOR=1/' /etc/systemd/system/iio-sensor-proxy.service"
         rlRun "systemctl daemon-reload"
         rlSEService - ${SERVICE_NAME} ${PROCESS_NAME} ${PROCESS_CONTEXT} "restart status" 1
         rlRun "gdbus introspect --system --dest net.hadess.SensorProxy --object-path /net/hadess/SensorProxy"

diff --git a/selinux-policy/install-uninstall-dsp-packages/main.fmf b/selinux-policy/install-uninstall-dsp-packages/main.fmf
index 7fee6cc..4943936 100644
--- a/selinux-policy/install-uninstall-dsp-packages/main.fmf
+++ b/selinux-policy/install-uninstall-dsp-packages/main.fmf
@@ -30,6 +30,7 @@ tag:
   - NoRHIVOS
   - rhel9_broken
   - rhel10_broken
+  - avoidImageMode
 link:
 adjust:
   - enabled: false

diff --git a/selinux-policy/interface-definitions/main.fmf b/selinux-policy/interface-definitions/main.fmf
index 1d96ce5..b51e068 100644
--- a/selinux-policy/interface-definitions/main.fmf
+++ b/selinux-policy/interface-definitions/main.fmf
@@ -18,6 +18,7 @@ tag:
   - targeted
   - failinfedora
   - NoRHIVOS
+  - avoidImageMode
 link:
   - verifies: https://issues.redhat.com/browse/RHEL-2616
   - verifies: https://issues.redhat.com/browse/RHEL-16185

diff --git a/selinux-policy/kerberos-and-similar/runtest.sh b/selinux-policy/kerberos-and-similar/runtest.sh
index 5ba7389..c8b16a2 100755
--- a/selinux-policy/kerberos-and-similar/runtest.sh
+++ b/selinux-policy/kerberos-and-similar/runtest.sh
@@ -198,6 +198,7 @@ rlJournalStart
     fi
 
     rlPhaseStartTest "real scenario for kpropd"
+        rlRun "mkdir -p /var/kerberos/krb5kdc"
         rlRun "touch /var/kerberos/krb5kdc/kpropd.acl"
         rlRun "rm -f /etc/krb5.conf"
         rlRun "cp ./krb5.conf /etc"

diff --git a/selinux-policy/kernel-confined-exec/main.fmf b/selinux-policy/kernel-confined-exec/main.fmf
index e2c42b9..cb38a23 100644
--- a/selinux-policy/kernel-confined-exec/main.fmf
+++ b/selinux-policy/kernel-confined-exec/main.fmf
@@ -33,3 +33,4 @@ extra-nitrate: TC#0614676
 id: 4400999a-aa60-4522-b0f7-d7b0656110a3
 tag:
   - NoRHIVOS
+  - avoidImageMode

diff --git a/selinux-policy/ksm-and-similar/runtest.sh b/selinux-policy/ksm-and-similar/runtest.sh
index 29d93d9..b4533f0 100755
--- a/selinux-policy/ksm-and-similar/runtest.sh
+++ b/selinux-policy/ksm-and-similar/runtest.sh
@@ -51,7 +51,7 @@ rlJournalStart
         rlRun "rpm -qf ${FILE_PATH}"
 
         rlServiceStop ${SERVICE_NAME}
-        rlFileBackup /usr/lib/systemd/system/ksm.service
+        rlFileBackup /etc/systemd/system/ksm.service
 
         rlSESetEnforce
         rlSEStatus
@@ -79,16 +79,19 @@ rlJournalStart
     rlPhaseEnd
     fi
 
+    if [ -f /usr/lib/systemd/system/ksm.service ] ; then
     rlPhaseStartTest "real scenario -- standalone service"
         if ! rlSEDefined ${PROCESS_CONTEXT} ; then
             PROCESS_CONTEXT="unconfined_service_t"
         fi
-        rlRun "sed -i 's/^ConditionVirtualization=.*$//' /usr/lib/systemd/system/ksm.service"
+        rlRun "cp -f /usr/lib/systemd/system/ksm.service /etc/systemd/system/"
+        rlRun "sed -i 's/^ConditionVirtualization=.*$//' /etc/systemd/system/ksm.service"
         rlRun "systemctl daemon-reload"
         rlSEService - ${SERVICE_NAME} - ${PROCESS_CONTEXT} "start status" 1
         rlRun "restorecon -Rv /etc /run /var -e /var/ARTIFACTS" 0-255
         rlSEService - ${SERVICE_NAME} - ${PROCESS_CONTEXT} "restart status stop status" 1
     rlPhaseEnd
+    fi
 
     rlPhaseStartCleanup
         sleep 2

diff --git a/selinux-policy/libvirt-dbus-and-similar/main.fmf b/selinux-policy/libvirt-dbus-and-similar/main.fmf
index 9115a73..a039ecc 100644
--- a/selinux-policy/libvirt-dbus-and-similar/main.fmf
+++ b/selinux-policy/libvirt-dbus-and-similar/main.fmf
@@ -28,6 +28,7 @@ tag:
   - NoRHEL7
   - targeted
   - NoRHIVOS
+  - avoidImageMode
 link:
   - verifies: https://issues.redhat.com/browse/RHEL-46893
   - verifies: https://issues.redhat.com/browse/RHEL-73914

diff --git a/selinux-policy/logwatch-and-similar/runtest.sh b/selinux-policy/logwatch-and-similar/runtest.sh
index c3321f1..bb60374 100755
--- a/selinux-policy/logwatch-and-similar/runtest.sh
+++ b/selinux-policy/logwatch-and-similar/runtest.sh
@@ -45,7 +45,7 @@ rlJournalStart
         rlAssertRpm ${SERVICE_PACKAGE}
 
         rlServiceStop ${SERVICE_NAME}
-        rlFileBackup /usr/lib/systemd/system/logwatch.timer
+        rlFileBackup /etc/systemd/system/logwatch.timer
 
         rlSESetEnforce
         rlSEStatus
@@ -75,27 +75,31 @@ rlJournalStart
     fi
 
     rlPhaseStartTest "real scenario -- standalone service"
+        rlRun "mkdir -p /var/cache/logwatch"
         if ! rlSEDefined ${PROCESS_CONTEXT} ; then
             # for environments where the SELinux domain does not exist yet
             PROCESS_CONTEXT="unconfined_service_t"
         fi
         rlSEService - ${SERVICE_NAME} - ${PROCESS_CONTEXT} "start status" 1
-        rlRun "restorecon -Rv /var /run -e /var/ARTIFACTS" 0-255
+        rlRun "restorecon -Rv /etc /var /run -e /var/ARTIFACTS" 0-255
         rlSEService - ${SERVICE_NAME} - ${PROCESS_CONTEXT} "restart status stop status" 1
     rlPhaseEnd
 
+    if [ -f /usr/lib/systemd/system/${SERVICE_NAME}.timer ] ; then
     rlPhaseStartTest "real scenario -- timer"
         rlRun "systemctl enable ${SERVICE_NAME}.timer"
         rlRun "systemctl start ${SERVICE_NAME}.timer"
         rlRun "systemctl list-timers --all"
         NEXT_TIME=`date -d "now + 1 minute" "+%H:%M"`
-        rlRun "sed -i 's/AccuracySec=.*$/AccuracySec=1s\nOnCalendar=*-*-* $NEXT_TIME/' /usr/lib/systemd/system/${SERVICE_NAME}.timer"
+        rlRun "cp -f /usr/lib/systemd/system/${SERVICE_NAME}.timer /etc/systemd/system/"
+        rlRun "sed -i 's/AccuracySec=.*$/AccuracySec=1s\nOnCalendar=*-*-* $NEXT_TIME/' /etc/systemd/system/${SERVICE_NAME}.timer"
         rlRun "systemctl daemon-reload"
         rlRun "systemctl list-timers --all"
         rlRun "sleep 2m"
         rlRun "systemctl stop ${SERVICE_NAME}.timer"
         rlRun "systemctl disable ${SERVICE_NAME}.timer"
     rlPhaseEnd
+    fi
 
     rlPhaseStartCleanup
         sleep 2

diff --git a/selinux-policy/pcp-daemons-and-similar/main.fmf b/selinux-policy/pcp-daemons-and-similar/main.fmf
index 960c4e5..f03984c 100644
--- a/selinux-policy/pcp-daemons-and-similar/main.fmf
+++ b/selinux-policy/pcp-daemons-and-similar/main.fmf
@@ -35,6 +35,7 @@ tag:
   - failinfedora
   - targeted
   - NoRHIVOS
+  - avoidImageMode
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1028598
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1061159

diff --git a/selinux-policy/restorecond-fcontext-equivalences/main.fmf b/selinux-policy/restorecond-fcontext-equivalences/main.fmf
index dbdcdf1..771533d 100644
--- a/selinux-policy/restorecond-fcontext-equivalences/main.fmf
+++ b/selinux-policy/restorecond-fcontext-equivalences/main.fmf
@@ -21,6 +21,7 @@ tag:
   - NoRHEL7
   - targeted
   - NoRHIVOS
+  - avoidImageMode
 link:
   - verifies: https://issues.redhat.com/browse/RHEL-5032
 adjust:

diff --git a/selinux-policy/rpm-suppress-stderr/main.fmf b/selinux-policy/rpm-suppress-stderr/main.fmf
index f2e0832..b86deaa 100644
--- a/selinux-policy/rpm-suppress-stderr/main.fmf
+++ b/selinux-policy/rpm-suppress-stderr/main.fmf
@@ -11,6 +11,7 @@ duration: 10m
 enabled: true
 tag:
   - NoRHIVOS
+  - avoidImageMode
 link:
   - https://issues.redhat.com/browse/RHEL-59192
 adjust:

diff --git a/selinux-policy/rpmdb-and-similar/main.fmf b/selinux-policy/rpmdb-and-similar/main.fmf
index 0b2d45a..af883fa 100644
--- a/selinux-policy/rpmdb-and-similar/main.fmf
+++ b/selinux-policy/rpmdb-and-similar/main.fmf
@@ -30,6 +30,7 @@ tag:
   - NoRHEL8
   - targeted
   - NoRHIVOS
+  - avoidImageMode
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1461313
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1899548

diff --git a/selinux-policy/rsyslog-and-similar/main.fmf b/selinux-policy/rsyslog-and-similar/main.fmf
index ac991cb..e1e0924 100644
--- a/selinux-policy/rsyslog-and-similar/main.fmf
+++ b/selinux-policy/rsyslog-and-similar/main.fmf
@@ -31,6 +31,7 @@ tag:
   - NoRHEL4
   - targeted
   - NoRHIVOS
+  - avoidImageMode
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1823669
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1823672

diff --git a/selinux-policy/snapd-and-similar/main.fmf b/selinux-policy/snapd-and-similar/main.fmf
index 2fe0e0f..1507e52 100644
--- a/selinux-policy/snapd-and-similar/main.fmf
+++ b/selinux-policy/snapd-and-similar/main.fmf
@@ -36,6 +36,7 @@ tag:
   - rhel9_broken
   - rhel10_broken
   - NoRHIVOS
+  - avoidImageMode
 link:
   - verifies: https://bugzilla.redhat.com/show_bug.cgi?id=2207725
 adjust:

diff --git a/selinux-policy/systemd-creds/main.fmf b/selinux-policy/systemd-creds/main.fmf
index ba11ac5..168e9a8 100644
--- a/selinux-policy/systemd-creds/main.fmf
+++ b/selinux-policy/systemd-creds/main.fmf
@@ -23,6 +23,7 @@ enabled: true
 tag:
   - targeted
   - NoRHIVOS
+  - avoidImageMode
 tier: 2
 adjust:
   - enabled: false

diff --git a/selinux-policy/systemd-generators/main.fmf b/selinux-policy/systemd-generators/main.fmf
index ee5326b..a037266 100644
--- a/selinux-policy/systemd-generators/main.fmf
+++ b/selinux-policy/systemd-generators/main.fmf
@@ -31,6 +31,7 @@ tag:
   - f32friendly
   - targeted
   - NoRHIVOS
+  - avoidImageMode
 link:
   - verifies: https://bugzilla.redhat.com/show_bug.cgi?id=2230226
   - verifies: https://issues.redhat.com/browse/RHEL-72549

diff --git a/selinux-policy/systemd-notify-and-similar/main.fmf b/selinux-policy/systemd-notify-and-similar/main.fmf
index 04933f1..294c863 100644
--- a/selinux-policy/systemd-notify-and-similar/main.fmf
+++ b/selinux-policy/systemd-notify-and-similar/main.fmf
@@ -31,6 +31,7 @@ tag:
   - NoRHEL7
   - targeted
   - NoRHIVOS
+  - avoidImageMode
 tier: 2
 link:
   - verifies: https://bugzilla.redhat.com/show_bug.cgi?id=1903305

diff --git a/selinux-policy/valkey-and-similar/main.fmf b/selinux-policy/valkey-and-similar/main.fmf
index 110f6a2..6fd1b47 100644
--- a/selinux-policy/valkey-and-similar/main.fmf
+++ b/selinux-policy/valkey-and-similar/main.fmf
@@ -31,6 +31,7 @@ tag:
   - Tier3
   - Tier3se
   - NoRHIVOS
+  - avoidImageMode
 adjust:
   - enabled: false
     when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-8

diff --git a/selinux-policy/virt-install-additional/main.fmf b/selinux-policy/virt-install-additional/main.fmf
index 7cf0d61..c0e5f85 100644
--- a/selinux-policy/virt-install-additional/main.fmf
+++ b/selinux-policy/virt-install-additional/main.fmf
@@ -37,6 +37,7 @@ tag:
   - targeted
   - failinfedora
   - NoRHIVOS
+  - avoidImageMode
 link:
   - verifies: https://issues.redhat.com/browse/RHEL-56029
   - verifies: https://issues.redhat.com/browse/RHEL-65038

diff --git a/selinux-policy/virtualization-daemons/main.fmf b/selinux-policy/virtualization-daemons/main.fmf
index 2716b7e..f30e275 100644
--- a/selinux-policy/virtualization-daemons/main.fmf
+++ b/selinux-policy/virtualization-daemons/main.fmf
@@ -48,6 +48,7 @@ tag:
   - targeted
   - failinfedora
   - NoRHIVOS
+  - avoidImageMode
 adjust:
   - enabled: false
     when: distro < centos-stream-9

diff --git a/setools/apol/main.fmf b/setools/apol/main.fmf
index 199523b..7714c25 100644
--- a/setools/apol/main.fmf
+++ b/setools/apol/main.fmf
@@ -25,12 +25,11 @@ tag:
   - NoRHEL6
   - NoRHEL7
   - targeted
-  - rhel10_broken
 link:
   - relates: https://issues.redhat.com/browse/RHEL-29967
 adjust:
   - enabled: false
-    when: distro == rhel-4, rhel-5, rhel-6, rhel-7
+    when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-10
     continue: false
 extra-summary: /CoreOS/setools/Sanity/apol
 extra-task: /CoreOS/setools/Sanity/apol

diff --git a/setools/rebuild-from-srpm/main.fmf b/setools/rebuild-from-srpm/main.fmf
index 01286da..78a4763 100644
--- a/setools/rebuild-from-srpm/main.fmf
+++ b/setools/rebuild-from-srpm/main.fmf
@@ -21,6 +21,7 @@ tag:
   - NoRHEL6
   - NoRHEL7
   - targeted
+  - avoidImageMode
 link:
   - verifies: https://bugzilla.redhat.com/show_bug.cgi?id=2251915
   - verifies: https://issues.redhat.com/browse/RHEL-18067

                 reply	other threads:[~2026-09-11 13:23 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178913300055.1.15292952556221639064.tests-selinux-1eb61b3a69e6@fedoraproject.org \
    --to=mmalik@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox