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

Adjustable host memory. Allow custom command arguments.

This commit is contained in:
Chris Roberts 2017-03-15 09:30:57 -07:00
parent d25d6d1b8b
commit ce2a1ac634
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,17 +51,23 @@ Vagrant.configure(2) do |global_config|
config.vm.synced_folder '.', '/vagrant', disable: true
config.vm.synced_folder '../../', '/vagrant'
config.vm.provider :vmware_workstation do |vmware|
vmware.vmx["memsize"] = "2048"
vmware.vmx["memsize"] = ENV.fetch("VAGRANT_HOST_MEMORY", "2048")
vmware.vmx['vhv.enable'] = 'TRUE'
vmware.vmx['vhv.allow'] = 'TRUE'
end
config.vm.provision :shell, path: "./scripts/#{platform}-setup.#{provider_name}.sh"
GUEST_BOXES.each do |guest_box, box_version|
config.vm.provision :shell, path: "./scripts/#{platform}-setup.#{provider_name}.sh", run: "once"
GUEST_BOXES.each_with_index do |box_info, idx|
guest_box, box_version = box_info
spec_cmd_args = ENV["VAGRANT_SPEC_ARGS"]
if idx != 0
spec_cmd_args = "#{spec_cmd_args} --without-component 'cli/*'".strip
end
config.vm.provision(
:shell,
path: "./scripts/#{platform}-run.#{provider_name}.sh",
keep_color: true,
env: {
"VAGRANT_SPEC_ARGS" => "--no-builtin #{spec_cmd_args}".strip,
"VAGRANT_SPEC_BOX" => "/vagrant/test/vagrant-spec/boxes/#{guest_box.sub('/', '_')}.#{provider_name}.#{box_version}.box"
}
)

2
test/vagrant-spec/scripts/ubuntu-run.virtualbox.sh
View File

@ -2,7 +2,7 @@
set -x
export VAGRANT_SPEC_BOX="${VAGRANT_SPEC_BOX}"
vagrant vagrant-spec /vagrant/test/vagrant-spec/configs/vagrant-spec.config.virtualbox.rb
vagrant vagrant-spec ${VAGRANT_SPEC_ARGS} /vagrant/test/vagrant-spec/configs/vagrant-spec.config.virtualbox.rb
result=$?
exit $result