45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From 1cc7757f85010539170ff99c5c6f00c75918a8ca Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= <thozza@redhat.com>
|
|
Date: Tue, 4 Jun 2024 14:52:05 +0200
|
|
Subject: [PATCH] Tools/provision.sh: adjust conditional EPEL installation for
|
|
el10
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
EPEL-10 can't be installed on any of c10s and el10. Previously, the
|
|
script would try to install EPEL repositories package on el10 and fail.
|
|
|
|
In addition, use our "workaround" repository with c10s builds of some
|
|
packages (such as koji) also on el10.
|
|
|
|
Signed-off-by: Tomáš Hozza <thozza@redhat.com>
|
|
---
|
|
tools/provision.sh | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/tools/provision.sh b/tools/provision.sh
|
|
index 1c6eca8de..bab30fc99 100755
|
|
--- a/tools/provision.sh
|
|
+++ b/tools/provision.sh
|
|
@@ -31,14 +31,14 @@ fi
|
|
# and install koji and ansible here.
|
|
#
|
|
# TODO: Adjust the c10s condition, once EPEL-10 is available.
|
|
-if [[ $ID == rhel || ($ID == centos && ${VERSION_ID%.*} -lt 10) ]] && ! rpm -q epel-release; then
|
|
+if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} -lt 10 ]] && ! rpm -q epel-release; then
|
|
curl -Ls --retry 5 --output /tmp/epel.rpm \
|
|
https://dl.fedoraproject.org/pub/epel/epel-release-latest-"${VERSION_ID%.*}".noarch.rpm
|
|
sudo rpm -Uvh /tmp/epel.rpm
|
|
fi
|
|
|
|
# TODO: Remove this workaround, once koji is in EPEL-10
|
|
-if [[ $ID == centos && ${VERSION_ID%.*} == 10 ]]; then
|
|
+if [[ ($ID == rhel || $ID == centos) && ${VERSION_ID%.*} == 10 ]]; then
|
|
sudo dnf copr enable -y @osbuild/centpkg "centos-stream-10-$(uname -m)"
|
|
fi
|
|
|
|
--
|
|
2.45.1
|
|
|