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

test/pkgdep: Remove support for centos 7 



2d523857 already
addressed Centos 7 removal from pkgdep scripts, but
some places were missed.

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


Reviewed-by: default avatarBoris Glimcher <Boris.Glimcher@emc.com>
Tested-by: default avatarSPDK Automated Test System <spdkbot@gmail.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
Reviewed-by: default avatarMichal Berger <michal.berger@nutanix.com>
Reviewed-by: default avatarJacek Kalwas <jacek.kalwas@nutanix.com>
parent 2d1116a1

scripts/pkgdep/rhel.sh

+0 −9
Original line number Diff line number Diff line
@@ -111,15 +111,6 @@ yum install -y gcc gcc-c++ make CUnit-devel libaio-devel openssl-devel \ 
# workaround for arm: ninja fails with dep on skbuild python module

if [ "$(uname -m)" = "aarch64" ]; then

	pip3 install scikit-build

	if echo "$ID $VERSION_ID" | grep -E -q 'centos 7'; then

		# by default centos 7.x uses cmake 2.8 while ninja requires 3.6 or higher

		yum install -y cmake3

		# cmake3 is installed as /usr/bin/cmake3 while ninja directly calls `cmake`. Create a soft link

		# as a workaround

		mkdir -p /tmp/bin/

		ln -s /usr/bin/cmake3 /tmp/bin/cmake > /dev/null 2>&1 || true

		export PATH=/tmp/bin:$PATH

	fi

fi



if echo "$ID $VERSION_ID" | grep -E -q 'centos 8|rhel 8|rocky 8'; then

test/common/config/pkgdep/os/rhel

+0 −6
Original line number Diff line number Diff line
@@ -7,12 +7,6 @@ pre_install() { 


	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

}

test/common/config/pkgdep/yum

+0 −4
Original line number Diff line number Diff line
@@ -78,10 +78,6 @@ 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