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: Michal Berger <michal.berger@intel.com>
Change-Id: Ieec6796bf457d37b2618a1c2756d281f4af0c5b4
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/16931
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>

test/common/config/pkgdep/dnf

@@ -1,88 +0,0 @@
-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

@@ -11,56 +11,76 @@ install() {
 }
 
 packages=(
-	pciutils
+	astyle-devel
-	valgrind
-	jq
-	nvme-cli
-	gdb
-	fio
-	libaio-devel
-	kernel-devel
-	gflags-devel
-	libasan
-	libubsan
 	autoconf
 	automake
-	libtool
+	bc
-	libmount-devel
+	bison
-	iscsi-initiator-utils
+	ceph
-	isns-utils-devel pmempool
+	clang-analyzer
-	perl-open
-	glib2-devel
-	pixman-devel
-	astyle-devel
 	elfutils
 	elfutils-libelf-devel
+	fio
 	flex
-	bison
+	gdb
-	targetcli
-	perl-Switch
-	librdmacm-utils
-	libibverbs-utils
 	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
+	pciutils
-	sshpass
+	perl-open
+	perl-Switch
+	pixman-devel
+	pmempool
+	python3
 	python3-pandas
 	rpm-build
-	iptables
-	clang-analyzer
-	bc
-	kernel-modules-extra
-	systemd-devel
-	python3
-	wget
-	btrfs-progs
-	xfsprogs
 	rpmdevtools
 	ruby-devel
-	llvm
+	smartmontools
-	avahi
+	socat
-	avahi-tools
+	sshfs
+	systemd-devel
+	targetcli
+	valgrind
+	wget
+	xfsprogs
 )
 
+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() { :; }