Commit 58e6ef44 authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Tomasz Zawadzki
Browse files

scripts/vagrant: add option to build box for spdk 



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

Signed-off-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: Iedc21812b754692a5eba87127186e11ec44d805d
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/538


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 5b3c4b87

scripts/vagrant/create_vbox.sh

+8 −0
Original line number Diff line number Diff line
@@ -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 ""

scripts/vagrant/update.sh

+4 −9
Original line number Diff line number Diff line
@@ -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

		"$SPDK_DIR"/scripts/pkgdep.sh

		sudo -u vagrant "$SPDK_DIR"/test/common/config/vm_setup.sh -i

	fi

fi