From ca31f3c512e7d0e722c33849731ff96260d0a8ee Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Fri, 5 Mar 2021 11:02:23 +0100 Subject: [PATCH] scripts/vagrant: Run vm_setup.sh directly from the synced repo vagrant's shell provisioner uploads files to /tmp, however, vm_setup.sh must be run from the repo to find all the source files. This requires the repo by synced over to the VM as well. Signed-off-by: Michal Berger Change-Id: Iaf16f066af10739589aa584f57c2b89f5c5202e7 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6734 Tested-by: SPDK CI Jenkins Reviewed-by: Ben Walker Reviewed-by: Tomasz Zawadzki Reviewed-by: Karol Latecki Reviewed-by: Maciej Wawryk --- scripts/vagrant/Vagrantfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/vagrant/Vagrantfile b/scripts/vagrant/Vagrantfile index b543d9d93..0d34fcb65 100644 --- a/scripts/vagrant/Vagrantfile +++ b/scripts/vagrant/Vagrantfile @@ -173,10 +173,11 @@ end def deploy_test_vm(config) return unless ENV['DEPLOY_TEST_VM'] == "1" + return unless ENV['COPY_SPDK_DIR'] == "1" return unless ENV['SPDK_DIR'] config.vm.provision "shell" do |setup| - setup.path = ENV['SPDK_DIR'] + '/test/common/config/vm_setup.sh' + setup.inline = "/home/vagrant/spdk_repo/spdk/test/common/config/vm_setup.sh" setup.privileged = false setup.args = ["-u", "-i"] end