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

scripts/vagrant: add option to build box for spdk

Browse Source 
New option --package-box will install all dependencies needed to build SPDK

Signed-off-by: Maciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: Iedc21812b754692a5eba87127186e11ec44d805d
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/538
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Maciej Wawryk 2020-01-30 15:22:43 +01:00 committed by Tomasz Zawadzki
parent 5b3c4b8783
commit 58e6ef44f8
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/vagrant/create_vbox.sh
View File

@ -38,6 +38,7 @@ display_help() {
echo " --qemu-emulator=<path> directory path with emulator, default: ${SPDK_QEMU_EMULATOR}"
echo " --vagrantfiles-dir=<path> directory to put vagrantfile"
echo " -u allow password authentication to vagrant box"
echo " --package-box install all dependencies for SPDK and create local vagrant box"
echo " -r dry-run"
echo " -l use a local copy of spdk, don't try to rsync from the host."
echo " -d deploy a test vm by provisioning all prerequisites for spdk autotest"
@ -77,11 +78,13 @@ NVME_FILE=""
NVME_AUTO_CREATE=0
VAGRANTFILE_DIR=""
VAGRANT_PASSWORD_AUTH=0
VAGRANT_PACKAGE_BOX=0
while getopts ":b:n:s:x:p:u:vcrldh-:" opt; do
case "${opt}" in
-)
case "${OPTARG}" in
package-box) VAGRANT_PACKAGE_BOX=1 ;;
vhost-host-dir=*) VHOST_HOST_DIR="${OPTARG#*=}" ;;
vhost-vm-dir=*) VHOST_VM_DIR="${OPTARG#*=}" ;;
qemu-emulator=*) SPDK_QEMU_EMULATOR="${OPTARG#*=}" ;;
@ -225,6 +228,7 @@ if [ ${VERBOSE} = 1 ]; then
echo VHOST_HOST_DIR=$VHOST_HOST_DIR
echo VHOST_VM_DIR=$VHOST_VM_DIR
echo SPDK_QEMU_EMULATOR=$SPDK_QEMU_EMULATOR
echo VAGRANT_PACKAGE_BOX=$VAGRANT_PACKAGE_BOX
echo
fi
@ -303,6 +307,10 @@ EOF
fi
fi
vagrant up $provider
if [ ${VAGRANT_PACKAGE_BOX} == 1 ]; then
cd "$VAGRANTFILE_DIR"
vagrant ssh -c 'sudo spdk_repo/spdk/scripts/vagrant/update.sh'
fi
echo ""
echo " SUCCESS!"
echo ""

13
scripts/vagrant/update.sh
View File

@ -86,14 +86,9 @@ else
yum update -y
${SPDK_DIR}/scripts/pkgdep.sh
elif [ "$DISTRIB_ID" == "Fedora" ]; then
if [ "$DISTRIB_RELEASE" = "26" ]; then
echo
echo " Run \"${SPDK_DIR}/test/common/config/vm_setup.sh\" to complete setup of Fedora 26"
echo
else
yum check-update
yum update -y
${SPDK_DIR}/scripts/pkgdep.sh
fi
yum check-update
yum update -y
"$SPDK_DIR"/scripts/pkgdep.sh
sudo -u vagrant "$SPDK_DIR"/test/common/config/vm_setup.sh -i
fi
fi