diff --git a/scripts/pkgdep/rhel.sh b/scripts/pkgdep/rhel.sh index 4127d33cb..fc0522642 100755 --- a/scripts/pkgdep/rhel.sh +++ b/scripts/pkgdep/rhel.sh @@ -48,7 +48,7 @@ if [[ $ID == centos || $ID == rhel ]]; then if [[ $VERSION_ID == 8* ]]; then repos+=("https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm") repos+=("https://www.elrepo.org/elrepo-release-8.el8.elrepo.noarch.rpm") - [[ $ID == centos ]] && repos+=("centos-release-ceph-nautilus.noarch") + [[ $ID == centos ]] && repos+=("https://download.ceph.com/rpm-nautilus/el8/noarch/ceph-release-1-1.el8.noarch.rpm") # Add PowerTools needed for install CUnit-devel in Centos8 if [[ $ID == centos ]]; then is_repo "PowerTools" && enable+=("PowerTools") diff --git a/test/common/config/pkgdep/os/rhel b/test/common/config/pkgdep/os/rhel index a1430ccae..19a5afbdb 100644 --- a/test/common/config/pkgdep/os/rhel +++ b/test/common/config/pkgdep/os/rhel @@ -4,13 +4,15 @@ pre_install() { # installation failed. install tsocks || echo "Installation of the tsocks package failed, proxy may not be available" fi - if [[ $ID == centos ]] && (( VERSION_ID == 8 )); then - sudo "$package_manager" update -y --refresh - fi + if [[ $ID == centos ]] && (( VERSION_ID == 8 )); then + sudo "$package_manager" update -y --refresh + fi install nbd || { install wget - wget -O nbd.rpm https://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/n/nbd-3.14-2.el7.x86_64.rpm - install nbd.rpm + if [[ $ID == centos ]] && (( VERSION_ID == 7 )); then + wget -O nbd.rpm https://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/n/nbd-3.24-1.el7.x86_64.rpm + install nbd.rpm + fi } }