From 586ee5bfbabdc14da46cbce8849674afa62d5e9d Mon Sep 17 00:00:00 2001 From: Chris Roberts Date: Mon, 12 Mar 2018 09:06:10 -0700 Subject: [PATCH] Use common provider configuration. Include extra information output for logs. --- test/vagrant-spec/.runner-vmware.sh | 2 ++ test/vagrant-spec/Vagrantfile.spec | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/vagrant-spec/.runner-vmware.sh b/test/vagrant-spec/.runner-vmware.sh index a20e46189..dc06b2550 100755 --- a/test/vagrant-spec/.runner-vmware.sh +++ b/test/vagrant-spec/.runner-vmware.sh @@ -15,6 +15,8 @@ then mv "${GEM_PATH}" vagrant-spec.gem fi +vagrant status --debug + guests=$(vagrant status | grep vmware | awk '{print $1}') vagrant up --no-provision diff --git a/test/vagrant-spec/Vagrantfile.spec b/test/vagrant-spec/Vagrantfile.spec index 698c6a112..cd3ce9dea 100644 --- a/test/vagrant-spec/Vagrantfile.spec +++ b/test/vagrant-spec/Vagrantfile.spec @@ -57,12 +57,10 @@ Vagrant.configure(2) do |global_config| config.vm.box_version = box_version config.vm.synced_folder '.', '/vagrant', disable: true config.vm.synced_folder '../../', '/vagrant' - [:vmware_workstation, :vmware_fusion].each do |vmware_provider| - config.vm.provider vmware_provider do |vmware| - vmware.vmx["memsize"] = ENV.fetch("VAGRANT_HOST_MEMORY", "2048") - vmware.vmx['vhv.enable'] = 'TRUE' - vmware.vmx['vhv.allow'] = 'TRUE' - end + config.vm.provider :vmware_desktop do |vmware| + vmware.vmx["memsize"] = ENV.fetch("VAGRANT_HOST_MEMORY", "2048") + vmware.vmx['vhv.enable'] = 'TRUE' + vmware.vmx['vhv.allow'] = 'TRUE' end if platform == "windows" config.vm.provision :shell, path: "./scripts/#{platform}-setup.#{provider_name}.ps1", run: "once"