Commit 53c5691f authored by Michal Berger's avatar Michal Berger Committed by Ben Walker
Browse files

test/common: Merge pkgdep/dnf into pkgdep/yum 



There's no point in keeping these separate as dnf-aware distros
also support yum and there are no plans to drop it anytime soon.
In fact, since the actual list of packages between dnf and yum
was different, the centos7 was not provisioned to the full extent.

Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Change-Id: Ieec6796bf457d37b2618a1c2756d281f4af0c5b4
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16931


Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 64aa7a5c

test/common/config/pkgdep/dnf

deleted100644 → 0
+0 −88
Original line number Diff line number Diff line 
package_manager=dnf



upgrade() {

	sudo "$package_manager" upgrade -y

}



install() {

	(($#)) || return 0



	sudo "$package_manager" install -y "$@"

}



packages=(

	valgrind

	jq

	nvme-cli

	ceph

	gdb

	fio

	libaio-devel

	kernel-devel

	gflags-devel

	libasan

	libubsan

	autoconf

	automake

	libtool

	libmount-devel

	iscsi-initiator-utils

	isns-utils-devel

	pmempool

	perl-open

	glib2-devel

	pixman-devel

	astyle-devel

	elfutils

	libabigail

	elfutils-libelf-devel

	flex

	bison

	targetcli

	perl-Switch

	librdmacm-utils

	libibverbs-utils

	gdisk

	socat

	openssl

	sshfs

	python3-pandas

	rpm-build

	iptables

	clang-analyzer

	bc

	kernel-modules-extra

	systemd-devel

	smartmontools

	wget

	xfsprogs

	rpmdevtools

	ruby-devel

	llvm

)



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

	packages+=(btrfs-progs)

	packages+=(avahi)

	packages+=(avahi-tools)

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



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

	packages+=(iproute-tc)

fi



pre_install() { :; }



if [[ $OSID != fedora ]]; then

	echo "Located dnf package manager, but it was tested for Fedora only"

fi

test/common/config/pkgdep/yum

+58 −38
Original line number Diff line number Diff line
@@ -11,56 +11,76 @@ install() { 
}



packages=(

	pciutils

	valgrind

	jq

	nvme-cli

	gdb

	fio

	libaio-devel

	kernel-devel

	gflags-devel

	libasan

	libubsan

	astyle-devel

	autoconf

	automake

	libtool

	libmount-devel

	iscsi-initiator-utils

	isns-utils-devel pmempool

	perl-open

	glib2-devel

	pixman-devel

	astyle-devel

	bc

	bison

	ceph

	clang-analyzer

	elfutils

	elfutils-libelf-devel

	fio

	flex

	bison

	targetcli

	perl-Switch

	librdmacm-utils

	libibverbs-utils

	gdb

	gdisk

	socat

	gflags-devel

	glib2-devel

	iptables

	iscsi-initiator-utils

	isns-utils-devel

	jq

	kernel-devel

	kernel-modules-extra

	libabigail

	libaio-devel

	libasan

	libibverbs-utils

	libmount-devel

	librdmacm-utils

	libtool

	libubsan

	llvm

	nvme-cli

	openssl

	sshfs

	sshpass

	pciutils

	perl-open

	perl-Switch

	pixman-devel

	pmempool

	python3

	python3-pandas

	rpm-build

	iptables

	clang-analyzer

	bc

	kernel-modules-extra

	rpmdevtools

	ruby-devel

	smartmontools

	socat

	sshfs

	systemd-devel

	python3

	targetcli

	valgrind

	wget

	btrfs-progs

	xfsprogs

	rpmdevtools

	ruby-devel

	llvm

	avahi

	avahi-tools

)



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

	packages+=(btrfs-progs)

	packages+=(avahi)

	packages+=(avahi-tools)

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



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

	packages+=(iproute-tc)

fi



pre_install() { :; }