From 90477acc7ced05664bcef7919e9be09ae5fa6adb Mon Sep 17 00:00:00 2001
From: Maciej Wawryk <maciejx.wawryk@intel.com>
Date: Tue, 8 Sep 2020 16:12:41 +0200
Subject: [PATCH] test/pkgdep: move ibverbs-utils and rdmacm-utils to package
 list

Remove LIBRXE_INSTALL from pkgdep/apt-get because we dont use it any more.
Move ibverbs-utils and rdmacm-utils to package list for allway install in vm_setup.sh

Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: I0b0952bb898802a7f69460f7d6b2f41be3d82572
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4101
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Pawel Piatek <pawelx.piatek@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
---
 test/common/config/pkgdep/apt-get | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/common/config/pkgdep/apt-get b/test/common/config/pkgdep/apt-get
index a4e7f280a..2b2a8f4e5 100644
--- a/test/common/config/pkgdep/apt-get
+++ b/test/common/config/pkgdep/apt-get
@@ -36,10 +36,6 @@ pre_install() {
 	fi
 	if ! install rdma-core; then
 		echo "Package rdma-core is avaliable at Ubuntu 18 [universe] repositorium" >&2
-		install rdmacm-utils
-		install ibverbs-utils
-	else
-		LIBRXE_INSTALL=false
 	fi
 	if ! install libpmempool1; then
 		echo "Package libpmempool1 is available at Ubuntu 18 [universe] repositorium" >&2
@@ -95,6 +91,8 @@ packages=(
 	smartmontools
 	wget
 	xfsprogs
+	ibverbs-utils
+	rdmacm-utils
 )
 
 install_vagrant_dependencies() {