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

script/vagrant: split into functions - deploy test vm 



Signed-off-by: default avatarPawel 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: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
parent 211be739

scripts/vagrant/Vagrantfile

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