beaker 1.5.0 → 1.6.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/lib/beaker/answers/version32.rb +8 -0
- data/lib/beaker/dsl/helpers.rb +5 -1
- data/lib/beaker/version.rb +1 -1
- data/spec/beaker/dsl/helpers_spec.rb +24 -22
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
ZGEyOTZiYzFiN2YzMzJhYjYwNjg5NWE5Yjc5ZTg5NGYxMjVmODMzZA==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
YzkyNjNlMDdlZDE0ZDlhNWQzMjFjMTBkOGNjNDEyNzA1NjMyYmFjYg==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
MDVjOGE4ZWJlYjgxYmJkYzY2ODQ5ZjExNDQyOWZjY2ZjMjEyY2YxZjZlM2I4
|
10
|
+
NTc5Njg0YTk2NGNiMzFkYWNmY2YyNDNiNjFmOWU1OTlkOTU0YWJjZTBmYTIy
|
11
|
+
MGM5ZDZlOTFlMWU4OWVjMGY1YjVlZjEyMzcxMjgwOTZjMzM2YWI=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
MjRkZTgxNjM5MDhlODExMWI0ZTIwYzE5YzM3NmI0Yzg5ZDkwOGNlYWNlZTM4
|
14
|
+
YzAzOGE4YWQyNTljNjUyZDM1NTE3MjVmZGU4OWE5MjI3ZWM3NjNkNWY1N2Nk
|
15
|
+
MDc2OGNlNWE2NjRiMDBhMjU5NzMxMmMyMDlhNzQwMjFkZTMwMjI=
|
@@ -13,6 +13,14 @@ module Beaker
|
|
13
13
|
the_answers[dashboard.name][:q_puppetmaster_certname] = master_certname
|
14
14
|
end
|
15
15
|
|
16
|
+
if options[:type] == :upgrade && dashboard != database
|
17
|
+
# In a split configuration, there is no way for the upgrader
|
18
|
+
# to know how much disk space is available for the database
|
19
|
+
# migration. We tell it to continue on, because we're
|
20
|
+
# awesome.
|
21
|
+
the_answers[dashboard.name][:q_upgrade_with_unknown_disk_space] = 'y'
|
22
|
+
end
|
23
|
+
|
16
24
|
return the_answers
|
17
25
|
end
|
18
26
|
end
|
data/lib/beaker/dsl/helpers.rb
CHANGED
@@ -724,7 +724,7 @@ module Beaker
|
|
724
724
|
args << { :environment => opts[:environment]}
|
725
725
|
end
|
726
726
|
|
727
|
-
file_path =
|
727
|
+
file_path = host.tmpfile('apply_manifest.pp')
|
728
728
|
create_remote_file(host, file_path, manifest + "\n")
|
729
729
|
args << file_path
|
730
730
|
on host, puppet( 'apply', *args), on_options, &block
|
@@ -819,10 +819,14 @@ module Beaker
|
|
819
819
|
# This wraps the method `stub_hosts_on` and makes the stub specific to
|
820
820
|
# the forge alias.
|
821
821
|
#
|
822
|
+
# forge api v1 canonical source is forge.puppetlabs.com
|
823
|
+
# forge api v3 canonical source is forgeapi.puppetlabs.com
|
824
|
+
#
|
822
825
|
# @param machine [String] the host to perform the stub on
|
823
826
|
def stub_forge_on(machine)
|
824
827
|
@forge_ip ||= Resolv.getaddress(forge)
|
825
828
|
stub_hosts_on(machine, 'forge.puppetlabs.com' => @forge_ip)
|
829
|
+
stub_hosts_on(machine, 'forgeapi.puppetlabs.com' => @forge_ip)
|
826
830
|
end
|
827
831
|
|
828
832
|
# This wraps the method `stub_hosts` and makes the stub specific to
|
data/lib/beaker/version.rb
CHANGED
@@ -300,26 +300,26 @@ describe ClassMixedWithDSLHelpers do
|
|
300
300
|
it 'calls puppet' do
|
301
301
|
subject.should_receive( :create_remote_file ).and_return( true )
|
302
302
|
subject.should_receive( :puppet ).
|
303
|
-
with( 'apply', '--verbose',
|
303
|
+
with( 'apply', '--verbose', 'agent' ).
|
304
304
|
and_return( 'puppet_command' )
|
305
305
|
|
306
306
|
subject.should_receive( :on ).
|
307
|
-
with(
|
307
|
+
with( agent, 'puppet_command',
|
308
308
|
:acceptable_exit_codes => [0] )
|
309
309
|
|
310
|
-
subject.apply_manifest_on(
|
310
|
+
subject.apply_manifest_on( agent, 'class { "boo": }')
|
311
311
|
end
|
312
312
|
it 'adds acceptable exit codes with :catch_failures' do
|
313
313
|
subject.should_receive( :create_remote_file ).and_return( true )
|
314
314
|
subject.should_receive( :puppet ).
|
315
|
-
with( 'apply', '--verbose', '--trace', '--detailed-exitcodes',
|
315
|
+
with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
|
316
316
|
and_return( 'puppet_command' )
|
317
317
|
|
318
318
|
subject.should_receive( :on ).
|
319
|
-
with(
|
319
|
+
with( agent, 'puppet_command',
|
320
320
|
:acceptable_exit_codes => [0,2] )
|
321
321
|
|
322
|
-
subject.apply_manifest_on(
|
322
|
+
subject.apply_manifest_on( agent,
|
323
323
|
'class { "boo": }',
|
324
324
|
:trace => true,
|
325
325
|
:catch_failures => true )
|
@@ -327,14 +327,14 @@ describe ClassMixedWithDSLHelpers do
|
|
327
327
|
it 'allows acceptable exit codes through :catch_failures' do
|
328
328
|
subject.should_receive( :create_remote_file ).and_return( true )
|
329
329
|
subject.should_receive( :puppet ).
|
330
|
-
with( 'apply', '--verbose', '--trace', '--detailed-exitcodes',
|
330
|
+
with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
|
331
331
|
and_return( 'puppet_command' )
|
332
332
|
|
333
333
|
subject.should_receive( :on ).
|
334
|
-
with(
|
334
|
+
with( agent, 'puppet_command',
|
335
335
|
:acceptable_exit_codes => [4,0,2] )
|
336
336
|
|
337
|
-
subject.apply_manifest_on(
|
337
|
+
subject.apply_manifest_on( agent,
|
338
338
|
'class { "boo": }',
|
339
339
|
:acceptable_exit_codes => [4],
|
340
340
|
:trace => true,
|
@@ -343,17 +343,17 @@ describe ClassMixedWithDSLHelpers do
|
|
343
343
|
it 'enforces a 0 exit code through :catch_changes' do
|
344
344
|
subject.should_receive( :create_remote_file ).and_return( true )
|
345
345
|
subject.should_receive( :puppet ).
|
346
|
-
with( 'apply', '--verbose', '--trace', '--detailed-exitcodes',
|
346
|
+
with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
|
347
347
|
and_return( 'puppet_command' )
|
348
348
|
|
349
349
|
subject.should_receive( :on ).with(
|
350
|
-
|
350
|
+
agent,
|
351
351
|
'puppet_command',
|
352
352
|
:acceptable_exit_codes => [0]
|
353
353
|
)
|
354
354
|
|
355
355
|
subject.apply_manifest_on(
|
356
|
-
|
356
|
+
agent,
|
357
357
|
'class { "boo": }',
|
358
358
|
:trace => true,
|
359
359
|
:catch_changes => true
|
@@ -362,17 +362,17 @@ describe ClassMixedWithDSLHelpers do
|
|
362
362
|
it 'enforces a 2 exit code through :expect_changes' do
|
363
363
|
subject.should_receive( :create_remote_file ).and_return( true )
|
364
364
|
subject.should_receive( :puppet ).
|
365
|
-
with( 'apply', '--verbose', '--trace', '--detailed-exitcodes',
|
365
|
+
with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
|
366
366
|
and_return( 'puppet_command' )
|
367
367
|
|
368
368
|
subject.should_receive( :on ).with(
|
369
|
-
|
369
|
+
agent,
|
370
370
|
'puppet_command',
|
371
371
|
:acceptable_exit_codes => [2]
|
372
372
|
)
|
373
373
|
|
374
374
|
subject.apply_manifest_on(
|
375
|
-
|
375
|
+
agent,
|
376
376
|
'class { "boo": }',
|
377
377
|
:trace => true,
|
378
378
|
:expect_changes => true
|
@@ -381,17 +381,17 @@ describe ClassMixedWithDSLHelpers do
|
|
381
381
|
it 'enforces exit codes through :expect_failures' do
|
382
382
|
subject.should_receive( :create_remote_file ).and_return( true )
|
383
383
|
subject.should_receive( :puppet ).
|
384
|
-
with( 'apply', '--verbose', '--trace', '--detailed-exitcodes',
|
384
|
+
with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
|
385
385
|
and_return( 'puppet_command' )
|
386
386
|
|
387
387
|
subject.should_receive( :on ).with(
|
388
|
-
|
388
|
+
agent,
|
389
389
|
'puppet_command',
|
390
390
|
:acceptable_exit_codes => [1,4,6]
|
391
391
|
)
|
392
392
|
|
393
393
|
subject.apply_manifest_on(
|
394
|
-
|
394
|
+
agent,
|
395
395
|
'class { "boo": }',
|
396
396
|
:trace => true,
|
397
397
|
:expect_failures => true
|
@@ -400,7 +400,7 @@ describe ClassMixedWithDSLHelpers do
|
|
400
400
|
it 'enforces exit codes through :expect_failures' do
|
401
401
|
expect {
|
402
402
|
subject.apply_manifest_on(
|
403
|
-
|
403
|
+
agent,
|
404
404
|
'class { "boo": }',
|
405
405
|
:trace => true,
|
406
406
|
:expect_failures => true,
|
@@ -411,17 +411,17 @@ describe ClassMixedWithDSLHelpers do
|
|
411
411
|
it 'enforces added exit codes through :expect_failures' do
|
412
412
|
subject.should_receive( :create_remote_file ).and_return( true )
|
413
413
|
subject.should_receive( :puppet ).
|
414
|
-
with( 'apply', '--verbose', '--trace', '--detailed-exitcodes',
|
414
|
+
with( 'apply', '--verbose', '--trace', '--detailed-exitcodes', 'agent' ).
|
415
415
|
and_return( 'puppet_command' )
|
416
416
|
|
417
417
|
subject.should_receive( :on ).with(
|
418
|
-
|
418
|
+
agent,
|
419
419
|
'puppet_command',
|
420
420
|
:acceptable_exit_codes => [1,2,3,4,5,6]
|
421
421
|
)
|
422
422
|
|
423
423
|
subject.apply_manifest_on(
|
424
|
-
|
424
|
+
agent,
|
425
425
|
'class { "boo": }',
|
426
426
|
:acceptable_exit_codes => (1..5),
|
427
427
|
:trace => true,
|
@@ -479,6 +479,8 @@ describe ClassMixedWithDSLHelpers do
|
|
479
479
|
with( 'my_forge.example.com' ).and_return( '127.0.0.1' )
|
480
480
|
subject.should_receive( :stub_hosts_on ).
|
481
481
|
with( 'my_host', 'forge.puppetlabs.com' => '127.0.0.1' )
|
482
|
+
subject.should_receive( :stub_hosts_on ).
|
483
|
+
with( 'my_host', 'forgeapi.puppetlabs.com' => '127.0.0.1' )
|
482
484
|
|
483
485
|
subject.stub_forge_on( 'my_host' )
|
484
486
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: beaker
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.
|
4
|
+
version: 1.6.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Puppetlabs
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-01-
|
11
|
+
date: 2014-01-30 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rspec
|