beaker-vagrant 0.6.1 → 0.6.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: be5bca0523dc11ccbf64ec70bb412249c0f066ac
|
4
|
+
data.tar.gz: 42598743132e53abaaf332f544314af3e2679246
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f4b5d2b30e983d9c6e76c550ca0fc83c34416589f2aa35cd0096897d39d54560d0a4edb7fce58b878e56e1ab5c8cf043198a4819b40b77a13aed3920bdf80188
|
7
|
+
data.tar.gz: 731c1ba2c3ded6af01c86397e0e850f0832857b53071dd194f963f29c18870ae02805438752677f3fbe805a58ff0d7eb99b13bf1d45705495f2c37eccfd42893
|
@@ -102,6 +102,7 @@ module Beaker
|
|
102
102
|
v_file << " v.vm.network :forwarded_port, guest: 3389, host: 3389, id: 'rdp', auto_correct: true\n"
|
103
103
|
v_file << " v.vm.network :forwarded_port, guest: 5985, host: 5985, id: 'winrm', auto_correct: true\n"
|
104
104
|
v_file << " v.vm.guest = :windows\n"
|
105
|
+
v_file << " v.vm.communicator = 'winrm'\n"
|
105
106
|
end
|
106
107
|
|
107
108
|
if /osx/i.match(host['platform'])
|
@@ -166,6 +167,14 @@ module Beaker
|
|
166
167
|
host.close
|
167
168
|
|
168
169
|
set_ssh_config host, default_user
|
170
|
+
|
171
|
+
#allow the user to set the env
|
172
|
+
begin
|
173
|
+
host.ssh_permit_user_environment
|
174
|
+
host.close
|
175
|
+
rescue ArgumentError => e
|
176
|
+
@logger.debug("Failed to set SshPermitUserEnvironment. #{e}")
|
177
|
+
end
|
169
178
|
end
|
170
179
|
|
171
180
|
hack_etc_hosts @hosts, @options
|
@@ -239,6 +248,7 @@ module Beaker
|
|
239
248
|
|
240
249
|
set_all_ssh_config
|
241
250
|
end
|
251
|
+
super
|
242
252
|
end
|
243
253
|
|
244
254
|
def provision(provider = nil)
|
@@ -25,9 +25,10 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
|
|
25
25
|
|
26
26
|
def self.provider_vfile_section(host, options)
|
27
27
|
# Allow memory and CPUs to be set at a per node level or overall, and take the most specific setting
|
28
|
+
# Removing audio is a workaround of a virtualbox bug that gives error message : "The specified string / bytes buffer was to small"
|
28
29
|
provider_section = ""
|
29
30
|
provider_section << " v.vm.provider :virtualbox do |vb|\n"
|
30
|
-
provider_section << " vb.customize ['modifyvm', :id, '--memory', '#{memsize(host,options)}', '--cpus', '#{cpus(host,options)}']\n"
|
31
|
+
provider_section << " vb.customize ['modifyvm', :id, '--memory', '#{memsize(host,options)}', '--cpus', '#{cpus(host,options)}', '--audio', 'none']\n"
|
31
32
|
provider_section << " vb.vbguest.auto_update = false" if options[:vbguest_plugin] == 'disable'
|
32
33
|
|
33
34
|
# Guest volume support
|
@@ -1,3 +1,4 @@
|
|
1
|
+
require 'beaker/platform'
|
1
2
|
require 'spec_helper'
|
2
3
|
|
3
4
|
module Beaker
|
@@ -23,7 +24,8 @@ module Beaker
|
|
23
24
|
:http => {:from => 10080, :to => 80},
|
24
25
|
:ssl => {:from => 4443, :to => 443},
|
25
26
|
:tomcat => {:from => 8080, :to => 8080}
|
26
|
-
}
|
27
|
+
},
|
28
|
+
:platform => Beaker::Platform.new('centos-8-x86_64')
|
27
29
|
})
|
28
30
|
end
|
29
31
|
|
@@ -58,7 +60,7 @@ Vagrant.configure("2") do |c|
|
|
58
60
|
v.vm.network :forwarded_port, guest: 443, host: 4443
|
59
61
|
v.vm.network :forwarded_port, guest: 8080, host: 8080
|
60
62
|
v.vm.provider :virtualbox do |vb|
|
61
|
-
vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1']
|
63
|
+
vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1', '--audio', 'none']
|
62
64
|
end
|
63
65
|
end
|
64
66
|
c.vm.define 'vm2' do |v|
|
@@ -73,7 +75,7 @@ Vagrant.configure("2") do |c|
|
|
73
75
|
v.vm.network :forwarded_port, guest: 443, host: 4443
|
74
76
|
v.vm.network :forwarded_port, guest: 8080, host: 8080
|
75
77
|
v.vm.provider :virtualbox do |vb|
|
76
|
-
vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1']
|
78
|
+
vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1', '--audio', 'none']
|
77
79
|
end
|
78
80
|
end
|
79
81
|
c.vm.define 'vm3' do |v|
|
@@ -88,7 +90,7 @@ Vagrant.configure("2") do |c|
|
|
88
90
|
v.vm.network :forwarded_port, guest: 443, host: 4443
|
89
91
|
v.vm.network :forwarded_port, guest: 8080, host: 8080
|
90
92
|
v.vm.provider :virtualbox do |vb|
|
91
|
-
vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1']
|
93
|
+
vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1', '--audio', 'none']
|
92
94
|
end
|
93
95
|
end
|
94
96
|
end
|
@@ -256,6 +258,10 @@ EOF
|
|
256
258
|
expect( @generated_file ).to match /v.vm.guest = :windows/
|
257
259
|
end
|
258
260
|
|
261
|
+
it 'configures the guest type to use winrm' do
|
262
|
+
expect( @generated_file ).to match /v.vm.communicator = 'winrm'/
|
263
|
+
end
|
264
|
+
|
259
265
|
it 'sets a non-default memsize' do
|
260
266
|
expect( @generated_file ).to match /'--memory', '2048',/
|
261
267
|
end
|
@@ -293,7 +299,7 @@ EOF
|
|
293
299
|
|
294
300
|
generated_file = File.read( File.expand_path( File.join( path, "Vagrantfile") ) )
|
295
301
|
|
296
|
-
match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', 'hello!', '--cpus', '1'\]/)
|
302
|
+
match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', 'hello!', '--cpus', '1', '--audio', 'none'\]/)
|
297
303
|
|
298
304
|
expect( match ).to_not be nil
|
299
305
|
|
@@ -307,7 +313,7 @@ EOF
|
|
307
313
|
|
308
314
|
generated_file = File.read( File.expand_path( File.join( path, "Vagrantfile") ) )
|
309
315
|
|
310
|
-
match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', '1024', '--cpus', 'goodbye!'\]/)
|
316
|
+
match = generated_file.match(/vb.customize \['modifyvm', :id, '--memory', '1024', '--cpus', 'goodbye!', '--audio', 'none'\]/)
|
311
317
|
|
312
318
|
expect( match ).to_not be nil
|
313
319
|
|
@@ -634,10 +640,11 @@ EOF
|
|
634
640
|
before :each do
|
635
641
|
expect( vagrant ).to receive( :vagrant_cmd ).with( "up" ).once
|
636
642
|
@hosts.each do |host|
|
643
|
+
host[:platform] = 'windows'
|
637
644
|
host_prev_name = host['user']
|
638
|
-
expect( vagrant ).
|
639
|
-
expect( vagrant ).not_to receive( :copy_ssh_to_root ).with( host, options )
|
640
|
-
expect( vagrant ).
|
645
|
+
expect( vagrant ).not_to receive( :set_ssh_config ).with( host, 'vagrant' )
|
646
|
+
expect( vagrant ).not_to receive( :copy_ssh_to_root ).with( host, options )
|
647
|
+
expect( vagrant ).to receive( :set_ssh_config ).with( host, host_prev_name ).once
|
641
648
|
end
|
642
649
|
expect( vagrant ).to receive( :hack_etc_hosts ).with( @hosts, options ).once
|
643
650
|
end
|
@@ -27,7 +27,7 @@ describe Beaker::VagrantVirtualbox do
|
|
27
27
|
vagrant.make_vfile( @hosts )
|
28
28
|
|
29
29
|
vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
|
30
|
-
expect( vagrantfile ).to include( %Q{ v.vm.provider :virtualbox do |vb|\n vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1']\n end})
|
30
|
+
expect( vagrantfile ).to include( %Q{ v.vm.provider :virtualbox do |vb|\n vb.customize ['modifyvm', :id, '--memory', '1024', '--cpus', '1', '--audio', 'none']\n end})
|
31
31
|
end
|
32
32
|
|
33
33
|
it "can disable the vb guest plugin" do
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: beaker-vagrant
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.6.
|
4
|
+
version: 0.6.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Rishi Javia, Kevin Imber, Tony Vu
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2019-02-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|