[tests/selinux] pr775-checkpolicy-revdeps: add tags to tests which depend on EPEL packages

[tests/selinux] pr775-checkpolicy-revdeps: add tags to tests which depend on EPEL packages

[Milos Malik]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : e08af3f6df516169220260f30d6a40d2336272d2
            Author : Milos Malik <mmalik@redhat.com>
            Date   : 2024-05-22T18:23:24+02:00
            Stats  : +33/-8 in 11 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/e08af3f6df516169220260f30d6a40d2336272d2?branch=pr775-checkpolicy-revdeps

            Log:
            add tags to tests which depend on EPEL packages

Tests which depend on EPEL packages should be tagged properly.
Such tests should not be executed in environments where the EPEL
repository is not available.

---
diff --git a/selinux-policy/boinc-and-similar/main.fmf b/selinux-policy/boinc-and-similar/main.fmf
index 24cb118..afa72fe 100644
--- a/selinux-policy/boinc-and-similar/main.fmf
+++ b/selinux-policy/boinc-and-similar/main.fmf
@@ -31,6 +31,9 @@ tag:
   - f32friendly
   - f33friendly
   - targeted
+  - epel
+  - rhel8-epel
+  - rhel9-epel
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1618683
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1711682

diff --git a/selinux-policy/bz733494-amanda-and-similar/main.fmf b/selinux-policy/bz733494-amanda-and-similar/main.fmf
index e9f9505..39d1346 100644
--- a/selinux-policy/bz733494-amanda-and-similar/main.fmf
+++ b/selinux-policy/bz733494-amanda-and-similar/main.fmf
@@ -54,6 +54,9 @@ adjust:
   - enabled: false
     when: distro >= rhel-9
     because: the amanda package is not available there
+  - enabled: false
+    when: distro >= centos-stream-9
+    because: the amanda package is not available there
 extra-nitrate: TC#0114575
 extra-summary: /CoreOS/selinux-policy/Regression/bz733494-amanda-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/bz733494-amanda-and-similar

diff --git a/selinux-policy/caddy-and-similar/main.fmf b/selinux-policy/caddy-and-similar/main.fmf
index b1f10a9..ee390a0 100644
--- a/selinux-policy/caddy-and-similar/main.fmf
+++ b/selinux-policy/caddy-and-similar/main.fmf
@@ -24,6 +24,9 @@ enabled: true
 tag:
   - failinfedora
   - targeted
+  - epel
+  - rhel8-epel
+  - rhel9-epel
 adjust:
   - enabled: false
     when: distro == rhel-4, rhel-5, rhel-6, rhel-7

diff --git a/selinux-policy/cups-pdf-and-similar/main.fmf b/selinux-policy/cups-pdf-and-similar/main.fmf
index bf6cf21..1157713 100644
--- a/selinux-policy/cups-pdf-and-similar/main.fmf
+++ b/selinux-policy/cups-pdf-and-similar/main.fmf
@@ -32,6 +32,9 @@ tag:
   - NoRHEL6
   - NoRHEL7
   - targeted
+  - epel
+  - rhel8-epel
+  - rhel9-epel
 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/nasd-and-similar/main.fmf b/selinux-policy/nasd-and-similar/main.fmf
index 58b27f3..13a57a2 100644
--- a/selinux-policy/nasd-and-similar/main.fmf
+++ b/selinux-policy/nasd-and-similar/main.fmf
@@ -25,6 +25,9 @@ adjust:
   - enabled: false
     when: distro == rhel-4, rhel-5, rhel-6, rhel-7, rhel-8, centos-stream-8
     because: the nas package is not available there
+  - enabled: false
+    when: distro >= centos-stream-9
+    because: the nas package is not available there
 extra-summary: /CoreOS/selinux-policy/Regression/nasd-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/nasd-and-similar
 extra-nitrate: TC#0614607

diff --git a/selinux-policy/snapd-and-similar/main.fmf b/selinux-policy/snapd-and-similar/main.fmf
index 34efcfa..7b6a8c0 100644
--- a/selinux-policy/snapd-and-similar/main.fmf
+++ b/selinux-policy/snapd-and-similar/main.fmf
@@ -29,6 +29,9 @@ tag:
   - NoRHEL6
   - failinfedora
   - targeted
+  - epel
+  - rhel8-epel
+  - rhel9-epel
 link:
   - verifies: https://bugzilla.redhat.com/show_bug.cgi?id=2207725
 adjust:

diff --git a/selinux-policy/sslh-and-similar/main.fmf b/selinux-policy/sslh-and-similar/main.fmf
index 4b3bd3e..4cdaca8 100644
--- a/selinux-policy/sslh-and-similar/main.fmf
+++ b/selinux-policy/sslh-and-similar/main.fmf
@@ -31,6 +31,8 @@ tag:
   - f33friendly
   - targeted
   - failinfedora
+  - epel
+  - rhel8-epel
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1534624
 adjust:
@@ -38,7 +40,7 @@ adjust:
     when: distro >= rhel-9
     because: the sslh package is not available there
   - enabled: false
-    when: distro == centos-stream-9
+    when: distro >= centos-stream-9
     because: the sslh package is not available there
   - enabled: false
     when: arch == i386, ppc, s390, s390x

diff --git a/selinux-policy/systemd-bootchart-and-similar/main.fmf b/selinux-policy/systemd-bootchart-and-similar/main.fmf
index 0f723d1..3b36208 100644
--- a/selinux-policy/systemd-bootchart-and-similar/main.fmf
+++ b/selinux-policy/systemd-bootchart-and-similar/main.fmf
@@ -20,7 +20,7 @@ recommend:
 environment:
     AVC_ERROR: +no_avc_check
 duration: 10m
-enabled: true
+enabled: false
 tag:
   - NoRHEL4
   - NoRHEL5
@@ -30,9 +30,9 @@ link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1757050
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1838163
 adjust:
-  - enabled: false
-    when: distro == rhel-4, rhel-5, rhel-6, rhel-8, rhel-9, centos-stream-8, centos-stream-9
-    because: the systemd-bootchart package is not available there
+  - enabled: true
+    when: distro == fedora
+    because: the systemd-bootchart package is not available elsewhere
 extra-nitrate: TC#0608092
 extra-summary: /CoreOS/selinux-policy/Regression/systemd-bootchart-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/systemd-bootchart-and-similar

diff --git a/selinux-policy/thttpd-and-similar/main.fmf b/selinux-policy/thttpd-and-similar/main.fmf
index 28f74b1..6b601f7 100644
--- a/selinux-policy/thttpd-and-similar/main.fmf
+++ b/selinux-policy/thttpd-and-similar/main.fmf
@@ -31,6 +31,8 @@ tag:
   - f31friendly
   - f32friendly
   - targeted
+  - epel
+  - rhel8-epel
 tier: '2'
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1069843
@@ -38,10 +40,10 @@ link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1111581
 adjust:
   - enabled: false
-    when: distro == rhel-4, rhel-alt-7, rhel-9
+    when: distro == rhel-4, rhel-alt-7, rhel-9, rhel-10
     because: the thttpd package is not available there
   - enabled: false
-    when: distro == centos-stream-9
+    when: distro >= centos-stream-9
     because: the thttpd package is not available there
   - enabled: false
     when: arch == i386, ppc64, s390

diff --git a/selinux-policy/tlp-and-similar/main.fmf b/selinux-policy/tlp-and-similar/main.fmf
index cc29570..2866515 100644
--- a/selinux-policy/tlp-and-similar/main.fmf
+++ b/selinux-policy/tlp-and-similar/main.fmf
@@ -32,6 +32,9 @@ tag:
   - failinfedora
   - f33friendly
   - targeted
+  - epel
+  - rhel8-epel
+  - rhel9-epel
 link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1460481
   - verifies: https://bugzilla.redhat.com/show_bug.cgi?id=2221019

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