ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/common: Configure repo locations inline in vm_setup

Browse Source 
This allows a userto run the script without specifying a configuration
file. Removing this dependency opens us up to things like calling
vm_setup directly from a vagrantfile without having to first copy the
spdk source over.

Change-Id: I72074a445f8befc714c03cab57a2da539350c092
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/426944
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Seth Howell 2018-09-26 08:23:44 -07:00 committed by Ben Walker
parent 7bcdc55926
commit f1b3df73b6
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/common/config/vm_setup.conf
View File

@ -1,3 +1,4 @@
# This configuration file is provided for reference purposes.
GIT_REPO_SPDK=https://review.gerrithub.io/spdk/spdk GIT_REPO_SPDK=https://review.gerrithub.io/spdk/spdk
GIT_REPO_DPDK=https://github.com/spdk/dpdk.git GIT_REPO_DPDK=https://github.com/spdk/dpdk.git
GIT_REPO_LIBRXE=https://github.com/SoftRoCE/librxe-dev.git GIT_REPO_LIBRXE=https://github.com/SoftRoCE/librxe-dev.git

23
test/common/config/vm_setup.sh
View File

@ -25,7 +25,6 @@ VM_SETUP_PATH=$(readlink -f ${BASH_SOURCE%/*})
UPGRADE=false UPGRADE=false
INSTALL=false INSTALL=false
CONF="librxe,iscsi,rocksdb,fio,flamegraph,tsocks,qemu,vpp,libiscsi,nvmecli" CONF="librxe,iscsi,rocksdb,fio,flamegraph,tsocks,qemu,vpp,libiscsi,nvmecli"
CONF_PATH="${VM_SETUP_PATH}/vm_setup.conf"
function install_rxe_cfg() function install_rxe_cfg()
{ {
@ -288,14 +287,28 @@ while getopts 'iuht:c:-:' optchar; do
esac esac
done done
if [ ! -f "$CONF_PATH" ]; then if [ ! -z "$CONF_PATH" ]; then
echo Configuration file does not exist: "$CONF_PATH" if [ ! -f "$CONF_PATH" ]; then
exit 1 echo Configuration file does not exist: "$CONF_PATH"
exit 1
else
source "$CONF_PATH"
fi
fi fi
cd ~ cd ~
source "$CONF_PATH" : ${GIT_REPO_SPDK=https://review.gerrithub.io/spdk/spdk}; export GIT_REPO_SPDK
: ${GIT_REPO_DPDK=https://github.com/spdk/dpdk.git}; export GIT_REPO_DPDK
: ${GIT_REPO_LIBRXE=https://github.com/SoftRoCE/librxe-dev.git}; export GIT_REPO_LIBRXE
: ${GIT_REPO_OPEN_ISCSI=https://github.com/open-iscsi/open-iscsi}; export GIT_REPO_OPEN_ISCSI
: ${GIT_REPO_ROCKSDB=https://review.gerrithub.io/spdk/rocksdb}; export GIT_REPO_ROCKSDB
: ${GIT_REPO_FIO=http://git.kernel.dk/fio.git}; export GIT_REPO_FIO
: ${GIT_REPO_FLAMEGRAPH=https://github.com/brendangregg/FlameGraph.git}; export GIT_REPO_FLAMEGRAPH
: ${GIT_REPO_QEMU=https://github.com/spdk/qemu}; export GIT_REPO_QEMU
: ${GIT_REPO_VPP=https://gerrit.fd.io/r/vpp}; export GIT_REPO_VPP
: ${GIT_REPO_LIBISCSI=https://github.com/sahlberg/libiscsi}; export GIT_REPO_LIBISCSI
: ${GIT_REPO_SPDK_NVME_CLI=https://github.com/spdk/nvme-cli}; export GIT_REPO_SPDK_NVME_CLI
jobs=$(($(nproc)*2)) jobs=$(($(nproc)*2))