djpbessems/Tinkerbell.Sandbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #16 from tinkerbell/vagrantfile-env-fixes-0

Browse Source 
Vagrant virtualbox worker env override fixes
This commit is contained in:
Gianluca Arbezzano 2020-09-24 09:35:39 +02:00 committed by GitHub
commit 43e3fe8aaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deploy/vagrant/Vagrantfile vendored
View File

@ -1,9 +1,15 @@
ENV['VAGRANT_NO_PARALLEL'] = 'yes' ENV['VAGRANT_NO_PARALLEL'] = 'yes'
# Returns true if `GUI` environment variable is set to a non-empty value. # Returns true if `GUI` environment variable exists, value does not matter.
# Defaults to false # Defaults to false
def worker_gui_enabled? def worker_gui_enabled?
ENV.fetch('VAGRANT_WORKER_GUI', '').empty? ENV.include?('VAGRANT_WORKER_GUI')
end
# Returns true if `SCALE` environment variable exists, value does not matter.
# Defaults to false
def worker_display_scale_enabled?
ENV.include?('VAGRANT_WORKER_SCALE')
end end
Vagrant.configure('2') do |config| Vagrant.configure('2') do |config|
@ -57,6 +63,10 @@ Vagrant.configure('2') do |config|
vb.memory = 4*1024 vb.memory = 4*1024
vb.cpus = 1 vb.cpus = 1
vb.gui = worker_gui_enabled? vb.gui = worker_gui_enabled?
vb.customize [
'setextradata', :id,
'GUI/ScaleFactor', '3.0'
] if worker_display_scale_enabled?
vb.customize [ vb.customize [
'modifyvm', :id, 'modifyvm', :id,
'--nic1', 'none', '--nic1', 'none',

1
test/_vagrant/vagrant_test.go
View File

@ -95,7 +95,6 @@ func TestVagrantSetupGuide(t *testing.T) {
t.Logf("WorkflowID: %s", workflowID) t.Logf("WorkflowID: %s", workflowID)
os.Setenv("VAGRANT_WORKER_GUI", "false")
worker, err := vagrant.Up(ctx, worker, err := vagrant.Up(ctx,
vagrant.WithLogger(t.Logf), vagrant.WithLogger(t.Logf),
vagrant.WithMachineName("worker"), vagrant.WithMachineName("worker"),