Commit e5ebb4b4 authored by Karol Latecki's avatar Karol Latecki Committed by Tomasz Zawadzki
Browse files

Revert "test/pkgdep: Remove support for rocky|centos|rhel 8" 



This reverts commit 94d22300.

RHEL 8 (8.10 in particular) is still supported and has not
reached EOL.

Change-Id: I211e82e6f9775859ec4fb65a782d2f6774cbaa8a
Signed-off-by: default avatarKarol Latecki <karol.latecki@nutanix.com>
Reviewed-on: https://review.spdk.io/c/spdk/spdk/+/26644


Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Reviewed-by: default avatarMichal Berger <michal.berger@nutanix.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
Reviewed-by: default avatarJacek Kalwas <jacek.kalwas@nutanix.com>
parent 9eb9f8c1

test/common/config/pkgdep/os/rhel

+10 −0
Original line number Diff line number Diff line
@@ -4,6 +4,16 @@ pre_install() { 
		# installation failed.

		install tsocks || echo "Installation of the tsocks package failed, proxy may not be available"

	fi



	if [[ $ID == centos || $ID == rocky ]] && [[ $VERSION_ID == 8* ]]; then

		sudo "$package_manager" update -y --refresh

	elif [[ $ID == centos ]] && ((VERSION_ID == 7)); then

		install nbd || {

			install wget

			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

}



# Add packages for TLS testing against kernel

test/common/config/pkgdep/yum

+14 −3
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ packages=( 
	smartmontools

	socat

	sshfs

	sshpass

	systemd-devel

	targetcli

	valgrind
@@ -77,12 +76,18 @@ elif [[ $OSID == rocky ]]; then 
	packages+=(avahi-tools) # from the devel repo

elif [[ $OSID == centos ]]; then

	packages+=(avahi)

	# 8 comes with a kernel which does not support btrfs.

	# 8 does not come with any common repos that include avahi-tools.

	if [[ $OSVERSION == 7* ]]; then

		packages+=(avahi-tools)

		packages+=(btrfs-progs)

	fi

elif [[ $OSID == rhel ]]; then

	packages+=(avahi)

	if [[ $OSVERSION == 9* ]]; then

		packages+=("https://dl.rockylinux.org/pub/rocky/9/devel/x86_64/os/Packages/i/isns-utils-devel-0.101-4.el9.x86_64.rpm")

	elif [[ $OSVERSION == 10* ]]; then

		packages+=("https://dl.rockylinux.org/pub/rocky/10/devel/x86_64/os/Packages/i/isns-utils-devel-0.103-1.el10.x86_64.rpm")

	elif [[ $OSVERSION == 8* ]]; then

		packages+=("https://dl.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os/Packages/isns-utils-devel-0.99-1.el8.x86_64.rpm")

	fi

	# FIXME: This does not fit here, but there's no sane alternative. Using RPMs from other sources will fail to meet

	# dependencies anyway.
@@ -94,6 +99,12 @@ if [[ $OSID != rhel ]]; then 
	packages+=(python3-pandas)

fi



if [[ $OSID == centos && $OSVERSION == 8* ]]; then

	packages+=("https://rpmfind.net/linux/centos/8-stream/AppStream/x86_64/os/Packages/sshpass-1.09-4.el8.x86_64.rpm")

else

	packages+=(sshpass)

fi



if [[ $OSID == fedora ]] && ((OSVERSION == 34)); then

	packages+=(bpftrace)

fi