Skip to content

fix RPM conflicts in UBI builds and verification #574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thaJeztah merged 1 commit into from
Nov 11, 2026
+10 −2
Merged

fix RPM conflicts in UBI builds and verification #574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion hack/scripts/rpm-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ case "$pkgrelease" in
;;
rhel*)
# skipping rpmlint as it requires dependencies not available in ubi images
dnf install -y git rpm-build dnf-plugins-core
# UBI images can ship newer RPM packages than their repositories provide.
# Allow removing conflicting packages so RPM can match rpm-build's version.
dnf install -y --allowerasing git rpm-build dnf-plugins-core
;;
esac

Expand Down
8 changes: 7 additions & 1 deletion hack/scripts/verify-rpm-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,13 @@ case "$pkgrelease" in
dnf config-manager --enable ol10_addons ol10_codeready_builder
dnf install -y findutils
;;
fedora*|rhel*)
rhel*)
# UBI images can ship newer RPM packages than their repositories provide.
# Align RPM before package dependencies pull in plugins such as SELinux.
dnf distro-sync -y --allowerasing 'rpm*'
dnf install -y findutils dnf-plugins-core
;;
fedora*)
dnf install -y findutils dnf-plugins-core
;;
rockylinux8|almalinux8)
Expand Down
Loading