script/vagrant: split into functions - deploy test vm

Signed-off-by: Pawel Piatek <pawelx.piatek@intel.com>
Change-Id: I301a100f24f8bb7d20756ccfd0fcd29405956cfc
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3717
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
This commit is contained in:
Pawel Piatek 2020-08-10 16:05:03 +02:00 committed by Tomasz Zawadzki
parent 211be73970
commit b9e3b917e7

View File

@ -196,6 +196,17 @@ def setup_vagrant_cachier(config, plugins_sync_backend)
end
end
def deploy_test_vm(config)
return unless ENV['DEPLOY_TEST_VM'] == "1"
return unless ENV['SPDK_DIR']
config.vm.provision "shell" do |setup|
setup.path = ENV['SPDK_DIR'] + '/test/common/config/vm_setup.sh'
setup.privileged = false
setup.args = ["-u", "-i"]
end
end
Vagrant.configure(2) do |config|
# Pick the right distro and bootstrap, default is fedora30
@ -336,11 +347,5 @@ Vagrant.configure(2) do |config|
end
# provision the vm with all of the necessary spdk dependencies for running the autorun.sh tests
if ENV['DEPLOY_TEST_VM'] == "1" && spdk_dir != "none"
config.vm.provision "shell" do |setup|
setup.path = "#{spdk_dir}/test/common/config/vm_setup.sh"
setup.privileged = false
setup.args = ["-u", "-i"]
end
end
deploy_test_vm(config)
end