haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use common provider configuration. Include extra information output for logs.

This commit is contained in:
Chris Roberts 2018-03-12 09:06:10 -07:00
parent 030a08f869
commit 586ee5bfba
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/vagrant-spec/.runner-vmware.sh
View File

@ -15,6 +15,8 @@ then
mv "${GEM_PATH}" vagrant-spec.gem mv "${GEM_PATH}" vagrant-spec.gem
fi fi
vagrant status --debug
guests=$(vagrant status | grep vmware | awk '{print $1}') guests=$(vagrant status | grep vmware | awk '{print $1}')
vagrant up --no-provision vagrant up --no-provision

4
test/vagrant-spec/Vagrantfile.spec
View File

@ -57,13 +57,11 @@ Vagrant.configure(2) do |global_config|
config.vm.box_version = box_version config.vm.box_version = box_version
config.vm.synced_folder '.', '/vagrant', disable: true config.vm.synced_folder '.', '/vagrant', disable: true
config.vm.synced_folder '../../', '/vagrant' config.vm.synced_folder '../../', '/vagrant'
[:vmware_workstation, :vmware_fusion].each do |vmware_provider| config.vm.provider :vmware_desktop do |vmware|
config.vm.provider vmware_provider do |vmware|
vmware.vmx["memsize"] = ENV.fetch("VAGRANT_HOST_MEMORY", "2048") vmware.vmx["memsize"] = ENV.fetch("VAGRANT_HOST_MEMORY", "2048")
vmware.vmx['vhv.enable'] = 'TRUE' vmware.vmx['vhv.enable'] = 'TRUE'
vmware.vmx['vhv.allow'] = 'TRUE' vmware.vmx['vhv.allow'] = 'TRUE'
end end
end
if platform == "windows" if platform == "windows"
config.vm.provision :shell, path: "./scripts/#{platform}-setup.#{provider_name}.ps1", run: "once" config.vm.provision :shell, path: "./scripts/#{platform}-setup.#{provider_name}.ps1", run: "once"
else else