From 714776c0287445d8bfd9aaa1a7692776d88a6c77 Mon Sep 17 00:00:00 2001
From: Seth Howell <seth.howell@intel.com>
Date: Mon, 18 Jun 2018 15:48:48 -0700
Subject: [PATCH] test/config: Call pkgdep.sh from vm_setup

vm_setup.sh now calls pkgdep.sh to ensure that the basic packages needed
to compile SPDK are installed. Pkgdep remains a separate script because
it is supposed to contain the minimal set of packages for building SPDK.
while vm_setup is used to configure a complete testing environment.

Change-Id: I4038f522c66ad5b2c55ed73b1170f796b2c94e27
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/415895
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
---
 test/common/config/vm_setup.sh | 51 ++++++++++++----------------------
 1 file changed, 18 insertions(+), 33 deletions(-)

diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh
index 19ad81f7a..4e9da9cf6 100755
--- a/test/common/config/vm_setup.sh
+++ b/test/common/config/vm_setup.sh
@@ -24,16 +24,29 @@ set -e
 jobs=$(($(nproc)*2))
 
 sudo dnf upgrade -y
-sudo dnf install -y gcc
-sudo dnf install -y gcc-c++
-sudo dnf install -y make
 sudo dnf install -y git
+
+cd ~
+mkdir -p spdk_repo
+
+cd spdk_repo
+mkdir -p output
+if [ -d spdk ]; then
+    echo "spdk source already present, not cloning"
+else
+    git clone https://review.gerrithub.io/spdk/spdk
+fi
+cd spdk
+git submodule update --init --recursive
+sudo ./scripts/pkgdep.sh
+cd ~
+
+
 sudo dnf install -y jq
 sudo dnf install -y valgrind
 sudo dnf install -y nvme-cli
 sudo dnf install -y ceph
 sudo dnf install -y gdb
-sudo dnf install -y sg3_utils
 sudo dnf install -y fio
 sudo dnf install -y librbd-devel
 sudo dnf install -y kernel-devel
@@ -45,32 +58,15 @@ sudo dnf install -y automake
 sudo dnf install -y libtool
 sudo dnf install -y libmount-devel
 sudo dnf install -y isns-utils-devel
-sudo dnf install -y openssl-devel
-sudo dnf install -y numactl-devel
-sudo dnf install -y libaio-devel
-sudo dnf install -y CUnit-devel
-sudo dnf install -y clang-analyzer
-sudo dnf install -y libpmemblk-devel pmempool
-sudo dnf install -y libibverbs libibverbs-devel librdmacm librdmacm-devel
+sudo dnf install -y pmempool
 sudo dnf install -y perl-open
 sudo dnf install -y glib2-devel
 sudo dnf install -y pixman-devel
-sudo dnf install -y libiscsi-devel
-sudo dnf install -y doxygen
 sudo dnf install -y astyle-devel
-sudo dnf install -y python
-sudo dnf install -y python-pep8
-sudo dnf install -y lcov
-sudo dnf install -y libuuid-devel
 sudo dnf install -y elfutils-libelf-devel
 sudo dnf install -y flex
 sudo dnf install -y bison
 sudo dnf install -y targetcli
-sudo dnf install -y nasm
-
-cd ~
-
-mkdir -p spdk_repo
 
 # The librxe-dev repository provides a command line tool called rxe_cfg which makes it
 # very easy to use Soft-RoCE. The build pool utilizes this command line tool in the absence
@@ -89,17 +85,6 @@ else
 fi
 sudo dnf install -y perl-Switch librdmacm-utils libibverbs-utils
 
-cd spdk_repo
-mkdir -p output
-if [ -d spdk ]; then
-    echo "spdk source already present, not cloning"
-else
-    git clone https://review.gerrithub.io/spdk/spdk
-fi
-cd spdk
-git submodule update --init --recursive
-cd ~
-
 # The version of iscsiadm that ships with fedora 26 was broken as of November 3 2017.
 # There is already a bug report out about it, and hopefully it is fixed soon, but in the event that
 # that version is still broken when you do your setup, the below steps will fix the issue.