[tests/selinux] pr775-checkpolicy-revdeps: quickly end tests which require unavailable packages

[tests/selinux] pr775-checkpolicy-revdeps: quickly end tests which require unavailable packages

[Milos Malik]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : 067f66fc4af36e62e7561e82f47d3ea05d1bb4db
            Author : Milos Malik <mmalik@redhat.com>
            Date   : 2023-03-22T12:14:07+01:00
            Stats  : +35/-11 in 8 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/067f66fc4af36e62e7561e82f47d3ea05d1bb4db?branch=pr775-checkpolicy-revdeps

            Log:
            quickly end tests which require unavailable packages

Some packages are only available for Fedora or for older RHELs.
It makes no sense to run certain tests in environments where their
required packages are not unavailable.

---
diff --git a/selinux-policy/bz733494-amanda-and-similar/main.fmf b/selinux-policy/bz733494-amanda-and-similar/main.fmf
index f062952..2a38b85 100644
--- a/selinux-policy/bz733494-amanda-and-similar/main.fmf
+++ b/selinux-policy/bz733494-amanda-and-similar/main.fmf
@@ -59,8 +59,8 @@ link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1572696
 adjust:
   - enabled: false
-    when: distro == rhel-4, rhel-9
-    continue: false
+    when: distro >= rhel-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/bz733494-amanda-and-similar/runtest.sh b/selinux-policy/bz733494-amanda-and-similar/runtest.sh
index 80214f1..6c42aa5 100755
--- a/selinux-policy/bz733494-amanda-and-similar/runtest.sh
+++ b/selinux-policy/bz733494-amanda-and-similar/runtest.sh
@@ -38,6 +38,12 @@ PROCESS_NAME="amandad"
 PROCESS_CONTEXT="amanda_t"
 
 rlJournalStart
+    if rlIsRHEL && ! rlIsRHEL 7 8 ; then
+        rlLog "Not applicable to this OS version."
+        rlJournalEnd
+        exit 0
+    fi
+
     rlPhaseStartSetup
         rlRun "rlImport 'selinux-policy/common'"
         rlSESatisfyRequires

diff --git a/selinux-policy/icecast-and-similar/main.fmf b/selinux-policy/icecast-and-similar/main.fmf
index 497bea9..f2a6060 100644
--- a/selinux-policy/icecast-and-similar/main.fmf
+++ b/selinux-policy/icecast-and-similar/main.fmf
@@ -36,10 +36,10 @@ link:
 adjust:
   - enabled: false
     when: arch == i386, ppc, ppc64, s390
-    continue: false
+    because: the icecast package is not available for all architectures
   - enabled: false
-    when: distro == rhel-4, rhel-8, rhel-9
-    continue: false
+    when: distro >= rhel-8
+    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/icecast-and-similar/runtest.sh b/selinux-policy/icecast-and-similar/runtest.sh
index 62f7de7..36b3ded 100755
--- a/selinux-policy/icecast-and-similar/runtest.sh
+++ b/selinux-policy/icecast-and-similar/runtest.sh
@@ -39,6 +39,12 @@ PROCESS_NAME="icecast"
 PROCESS_CONTEXT="icecast_t"
 
 rlJournalStart
+    if rlIsRHEL ; then
+        rlLog "Not applicable to this OS version."
+        rlJournalEnd
+        exit 0
+    fi
+
     rlPhaseStartSetup
         rlRun "rlImport 'selinux-policy/common'"
         rlSESatisfyRequires

diff --git a/selinux-policy/sslh-and-similar/main.fmf b/selinux-policy/sslh-and-similar/main.fmf
index b2ebcd6..82f44cc 100644
--- a/selinux-policy/sslh-and-similar/main.fmf
+++ b/selinux-policy/sslh-and-similar/main.fmf
@@ -35,11 +35,11 @@ link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1534624
 adjust:
   - enabled: false
-    when: distro == rhel-4, rhel-5, rhel-6
-    continue: false
+    when: distro >= rhel-9
+    because: the sslh package is not available there
   - enabled: false
-    when: arch == s390x
-    continue: false
+    when: arch == i386, ppc, s390, s390x
+    because: the sslh package is not available for all architectures
 extra-nitrate: TC#0563428
 extra-summary: /CoreOS/selinux-policy/Regression/sslh-and-similar
 extra-task: /CoreOS/selinux-policy/Regression/sslh-and-similar

diff --git a/selinux-policy/sslh-and-similar/runtest.sh b/selinux-policy/sslh-and-similar/runtest.sh
index 7e33840..6803188 100755
--- a/selinux-policy/sslh-and-similar/runtest.sh
+++ b/selinux-policy/sslh-and-similar/runtest.sh
@@ -39,6 +39,12 @@ PROCESS_NAME="sslh"
 PROCESS_CONTEXT="sslh_t"
 
 rlJournalStart
+    if rlIsRHEL && ! rlIsRHEL 7 8 ; then
+        rlLog "Not applicable to this OS version."
+        rlJournalEnd
+        exit 0
+    fi
+
     rlPhaseStartSetup
         rlRun "rlImport 'selinux-policy/common'"
         rlSESatisfyRequires

diff --git a/selinux-policy/usbmuxd-and-similar/main.fmf b/selinux-policy/usbmuxd-and-similar/main.fmf
index ef0e7e3..6374d4c 100644
--- a/selinux-policy/usbmuxd-and-similar/main.fmf
+++ b/selinux-policy/usbmuxd-and-similar/main.fmf
@@ -43,8 +43,8 @@ link:
   - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1973886
 adjust:
   - enabled: false
-    when: distro == rhel-4, rhel-5, rhel-6
-    continue: false
+    when: distro >= rhel-9
+    because: the usbmuxd package is not available there
   - enabled: false
     when: arch == aarch64, s390x
     continue: false

diff --git a/selinux-policy/usbmuxd-and-similar/runtest.sh b/selinux-policy/usbmuxd-and-similar/runtest.sh
index 0b1dc0f..6fddd17 100755
--- a/selinux-policy/usbmuxd-and-similar/runtest.sh
+++ b/selinux-policy/usbmuxd-and-similar/runtest.sh
@@ -39,6 +39,12 @@ PROCESS_NAME="usbmuxd"
 PROCESS_CONTEXT="usbmuxd_t"
 
 rlJournalStart
+    if rlIsRHEL && ! rlIsRHEL 7 8 ; then
+        rlLog "Not applicable to this OS version."
+        rlJournalEnd
+        exit 0
+    fi
+
     rlPhaseStartSetup
         rlRun "rlImport 'selinux-policy/common'"
         rlSESatisfyRequires