Skip to content

Commit

Permalink
Merge pull request #3024 from ggiguash/revert-2990-cherry-pick-2989-t…
Browse files Browse the repository at this point in the history
…o-release-4.15

USHIFT-2346: Revert "[release-4.15] USHIFT-2346: Work around broken osbuild dependency on RHEL 9.3"
  • Loading branch information
openshift-merge-bot[bot] committed Feb 15, 2024
2 parents 8413173 + 8f62bcb commit 2a2e12b
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions scripts/image-builder/configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,8 @@ auth_file_path = "/etc/osbuild-worker/pull-secret.json"
EOF
fi

# Temporary workaround for broken selinux-policy
# dependencies of osbuild package on RHEL 9.3
OSBUILD_VER=""
source /etc/os-release
if [ "${ID}" == "rhel" ] && [ "${VERSION_ID}" == "9.3" ]; then
OSBUILD_VER="-93-1.el9"
fi

"${DNF_RETRY}" "install" \
"osbuild${OSBUILD_VER} osbuild-composer \
"osbuild osbuild-composer \
git composer-cli ostree rpm-ostree \
cockpit-composer bash-completion podman runc genisoimage \
createrepo yum-utils selinux-policy-devel jq wget lorax rpm-build \
Expand Down

0 comments on commit 2a2e12b

Please sign in to comment.