[tests/selinux] pr775-checkpolicy-revdeps: work around the dnf5 issue when --skip-broken is not recognized

[tests/selinux] pr775-checkpolicy-revdeps: work around the dnf5 issue when --skip-broken is not recognized

[Milos Malik]

            A new commit has been pushed.

            Repo   : tests/selinux
            Branch : pr775-checkpolicy-revdeps
            Commit : db5f56d258e7a2fe49b4fe4483e780e6eb06be6f
            Author : Milos Malik <mmalik@redhat.com>
            Date   : 2023-06-23T10:41:42+02:00
            Stats  : +3/-10 in 4 file(s)
            URL    : https://src.fedoraproject.org/tests/selinux/c/db5f56d258e7a2fe49b4fe4483e780e6eb06be6f?branch=pr775-checkpolicy-revdeps

            Log:
            work around the dnf5 issue when --skip-broken is not recognized

The SELinux beaker library calls the yum/dnf command and the
"--skip-broken" option is placed before the "install" word on the
command line. Such command line executed on Fedora rawhide leads to
the following error message:

  Unknown argument "--skip-broken" for command "dnf5". Add "--help" for
  more information about the arguments.

In order to work around this issue, the "install" word was moved before
the rest of options. Manual testing revealed that this approach works
on Fedora rawhide.

---
diff --git a/checkpolicy/sedispol/main.fmf b/checkpolicy/sedispol/main.fmf
index b141118..f6506f7 100644
--- a/checkpolicy/sedispol/main.fmf
+++ b/checkpolicy/sedispol/main.fmf
@@ -15,7 +15,6 @@ tag:
   - CI-Tier-1
   - NoRHEL4
   - NoRHEL5
-  - TIPfail_Security
   - Tier2
   - Tier2se
   - f31friendly

diff --git a/libsemanage/sanity-tests/main.fmf b/libsemanage/sanity-tests/main.fmf
index 1dc5b00..e44669e 100644
--- a/libsemanage/sanity-tests/main.fmf
+++ b/libsemanage/sanity-tests/main.fmf
@@ -17,7 +17,6 @@ tag:
   - CI-Tier-1
   - NoRHEL4
   - NoRHEL5
-  - TIPfail_Security
   - Tier1
   - Tier1se
   - f31friendly

diff --git a/selinux-policy/Library/common/lib.sh b/selinux-policy/Library/common/lib.sh
index 658d42e..7858110 100755
--- a/selinux-policy/Library/common/lib.sh
+++ b/selinux-policy/Library/common/lib.sh
@@ -1558,7 +1558,7 @@ function rlSESatisfyRequires() {
         return 0
     fi
 
-    rlRun "epelyum -y --nobest --nogpgcheck --skip-broken install ${PACKAGE_LIST} ${PACKAGE_LIST2}" 0,1
+    rlRun "epelyum install -y --nobest --nogpgcheck --skip-broken ${PACKAGE_LIST} ${PACKAGE_LIST2}" 0,1
 }
 
 __INTERNAL_rlSEModuleList() {
@@ -2024,9 +2024,9 @@ rlSELibraryLoaded() {
     fi
 
     if rlIsRHEL; then
-        rlRun "yum -y --skip-broken install $rlSE_REQUIRES"
+        rlRun "yum install -y --skip-broken $rlSE_REQUIRES"
     else
-        rlRun "dnf -y --skip-broken install $rlSE_REQUIRES"
+        rlRun "dnf install -y --skip-broken $rlSE_REQUIRES"
     fi
 
     # make sure that restorecon does not change SELinux contexts under /var/ARTIFACTS

diff --git a/selinux-policy/cups-browsed-and-similar/main.fmf b/selinux-policy/cups-browsed-and-similar/main.fmf
index d034c54..97d6169 100644
--- a/selinux-policy/cups-browsed-and-similar/main.fmf
+++ b/selinux-policy/cups-browsed-and-similar/main.fmf
@@ -28,11 +28,6 @@ tag:
   - NoRHEL5
   - NoRHEL6
   - RHEL8
-  - TIP_fedora_pass
-  - TIPfail_infra
-  - TIPpass
-  - TIPpass_FIPS
-  - TIPpass_Security
   - Tier1
   - Tier1security
   - Tier2se