diff --git a/schutzbot/deploy.sh b/schutzbot/deploy.sh index f0b4b54b..1586d2f5 100755 --- a/schutzbot/deploy.sh +++ b/schutzbot/deploy.sh @@ -42,16 +42,9 @@ gpgcheck=0 priority=10 EOF -if [[ $ID == rhel ]] && [[ ${VERSION_ID%.*} == 8 ]]; then +if [[ $ID == rhel || $ID == centos ]] && ! rpm -q epel-release; then # Set up EPEL repository (for ansible and koji) - sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -elif [[ $ID == rhel ]] && [[ ${VERSION_ID%.*} == 9 ]]; then - # we have our own small epel for EL9, let's install it - - # install Red Hat certificate, otherwise dnf copr fails - curl -LO --insecure https://hdn.corp.redhat.com/rhel8-csb/RPMS/noarch/redhat-internal-cert-install-0.1-23.el7.csb.noarch.rpm - sudo dnf install -y ./redhat-internal-cert-install-0.1-23.el7.csb.noarch.rpm dnf-plugins-core - sudo dnf copr enable -y copr.devel.redhat.com/osbuild-team/epel-el9 "rhel-9.dev-$ARCH" + sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-${VERSION_ID%.*}.noarch.rpm fi # Install the Image Builder packages.