Commit ac7b9b7c authored by Kamil Godzwon's avatar Kamil Godzwon Committed by Tomasz Zawadzki
Browse files

pkgdep/centos: fix centos routines for installing the packages 



Centos7: ndb package version update - version 3.14-2
of the nbd package is no longer available in
epel repository.
Updated for version 3.24-1.

Centos8: repository URL change - old ceph
repository has Centos version mismatch.

Centos8: no need to install NBD package. It is available
on the system by default.

Signed-off-by: default avatarKamil Godzwon <kamilx.godzwon@intel.com>
Change-Id: Ifae0833822b270127b31fe95c14f6803f688bfc6
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12156


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 2bc134eb

scripts/pkgdep/rhel.sh

+1 −1
Original line number Diff line number Diff line
@@ -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")

test/common/config/pkgdep/os/rhel

+7 −5
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ pre_install() { 


	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

		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

	}

}