Commit 2188940e authored by Pawel Piatek's avatar Pawel Piatek Committed by Tomasz Zawadzki
Browse files

test/vm_setup: add vagrant-install option 



Add option to install vagrant and it's plugins
required to run SPDK test VMs'.

Signed-off-by: default avatarPawel Piatek <pawelx.piatek@intel.com>
Change-Id: I89c9802ebb80bd411ebe93dbc98e54fb32779e4b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3576


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: default avatarMichal Berger <michalx.berger@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 69d5d77b

test/common/config/pkgdep/git

+33 −0
Original line number Diff line number Diff line
@@ -264,6 +264,38 @@ function install_extra_pkgs() { 
	fi

}



function install_vagrant() {

	local vagrant_version="2.2.7"

	local vagrant_installer="vagrant_${vagrant_version}_x86_64.deb"

	local vagrant_plugins=(vagrant-libvirt vagrant-sshfs vagrant-cachier vagrant-proxyconf)



	if [[ $OSID != ubuntu ]]; then

		error "Currently only ubuntu is supported"

	fi



	# Download and install vagrant

	if hash vagrant &> /dev/null; then

		echo "Vagrant is already installed"

	else

		wget "https://releases.hashicorp.com/vagrant/${vagrant_version}/${vagrant_installer}"

		sudo dpkg -i "${vagrant_installer}"

	fi

	vagrant --version



	# Install vagrant plugins

	local vagrant_plugin_list

	vagrant_plugin_list=$(vagrant plugin list)



	local plugin

	for plugin in "${vagrant_plugins[@]}"; do

		if grep -Fq "$plugin" <<< "$vagrant_plugin_list"; then

			echo "$plugin already installed"

		else

			vagrant plugin install "$plugin"

		fi

	done

}



GIT_VERSION=2.25.1

: ${GIT_REPO_SPDK=https://github.com/spdk/spdk.git}

export GIT_REPO_SPDK
@@ -315,6 +347,7 @@ else 
	)

fi

sources+=(install_fio)

sources+=(install_vagrant)



sudo mkdir -p /usr/{,local}/src

sudo mkdir -p "$GIT_REPOS"

test/common/config/vm_setup.sh

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ VM_SETUP_PATH=$(readlink -f ${BASH_SOURCE%/*}) 


UPGRADE=false

INSTALL=false

CONF="rocksdb,fio,flamegraph,tsocks,qemu,libiscsi,nvmecli,qat,spdk,refspdk"

CONF="rocksdb,fio,flamegraph,tsocks,qemu,libiscsi,nvmecli,qat,spdk,refspdk,vagrant"

package_manager=



function usage() {