From d09acccfe2edfc2e4f2a28e40706bc5ae0844350 Mon Sep 17 00:00:00 2001
From: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Date: Thu, 25 Jun 2020 07:46:26 -0400
Subject: [PATCH] test/vm_setup.sh: prioritize dnf over yum

It is possible to have yum on Fedora (either manual install
or via upgrade), yet dnf is the default pkg manager there.
Re-order the list of checks to pick dnf first if available.

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I48dfda2a248a7798c9d0c8b3cb4b8a3aa615e2a7
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3057
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Michal Berger <michalx.berger@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
---
 test/common/config/vm_setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh
index 59e515d0e..8bad41378 100755
--- a/test/common/config/vm_setup.sh
+++ b/test/common/config/vm_setup.sh
@@ -62,10 +62,10 @@ rootdir=$(readlink -f "$vmsetupdir/../../../")
 
 managers=("$vmsetupdir/pkgdep/"*)
 # Get package manager #
-if hash yum &> /dev/null; then
-	source "$vmsetupdir/pkgdep/yum"
-elif hash dnf &> /dev/null; then
+if hash dnf &> /dev/null; then
 	source "$vmsetupdir/pkgdep/dnf"
+elif hash yum &> /dev/null; then
+	source "$vmsetupdir/pkgdep/yum"
 elif hash apt-get &> /dev/null; then
 	source "$vmsetupdir/pkgdep/apt-get"
 elif hash pacman &> /dev/null; then