Compare commits
	
		
			2 Commits
		
	
	
		
			fix/terraf
			...
			vagrantfil
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | adfccfb1b0 | ||
|   | 4ba30f0ff7 | 
							
								
								
									
										14
									
								
								deploy/vagrant/Vagrantfile
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								deploy/vagrant/Vagrantfile
									
									
									
									
										vendored
									
									
								
							| @@ -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', | ||||||
|   | |||||||
| @@ -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"), | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user