beaker-pe 1.10.0 → 1.11.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ZDgzOGU0MzZjMWJmODI4MTkyNzM3NzkyY2M5ZmExYzY5MGYxM2M4Yg==
4
+ N2IyMTYxOWMzNzU2MzU0ZmRmNTM2NjQ2ODRiNTk1OWYyMzk0N2YzNA==
5
5
  data.tar.gz: !binary |-
6
- ZTA0YjhkODA1OWU3YTI1ODdmZjZhZWM3ZTYzYmYzMzA1NGEyOWM4Yw==
6
+ ZjBiMWIwYjY3NjI5MTc0NTQ4NjFjN2EzMWU2N2I0ZDYwZTZiMWRkOA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- NWVmNDA0Zjg5MTE5ZWI1NjczYTIwMTVlZjQzYmZiN2VhOGNmYjRiODYwZDNi
10
- MmY5MzNmYjk2OWIzMDRlZGE5OTg4OGU4NTA5NWNiYWQ3YTRlM2FkNzk3ODZi
11
- YTA0NmZkYTBhNGQ4NzZkMGJmZTI1MjYxMjljMjI1MDhmNDMyZjM=
9
+ ZDdhZDZlYjI1OTYzMzc3M2I3YjJmMmMzMDAyOTVkM2Q4NTQ3OTY0M2IwOTZk
10
+ NmNlYTcxOWVkYjVjOGQ0ZjcyMGNiN2NjMjM1NWUxYjYzYjBmNGIwN2I1M2Uw
11
+ MGE2NWUyNWZmMDM1MmMzOGI4ZGZlODQ0NzlmMmRjZWNiZmJjNWY=
12
12
  data.tar.gz: !binary |-
13
- NTI5NGJkNzdlYzViNmZhOTcxNjkxZTU4NWIwNjU1ODQzMzUzZWUzNDBiYjM1
14
- ZDNmYmJmNGU5M2U5Zjk5OTRkMTUzZjg2Yjc1NTBlYzllZDcxNzkxNTY4MmM4
15
- MWNhNzc4ODMxZDlhMWQzZTYyNjZjYjk0NTkyYzQzNDJmY2E0ODg=
13
+ MTEzMWRjMWM0ZTM1MDdiNTM2NTcwYjlhZDkxMGQwZmYwYWYzNjU3ZWNiOTYw
14
+ NTg1ZGNjMTM5NzJmNjQzMjRhODNkYWNkMTFkNGRkYTBiZDJhYjJlY2U3YzQ0
15
+ NDM2NzVmMTliMzNiNDM0YTZjZWQ2YmY4MGY2YTE3N2I0YTVjMDg=
data/HISTORY.md CHANGED
@@ -1,6 +1,7 @@
1
1
  # worker - History
2
2
  ## Tags
3
- * [LATEST - 20 Mar, 2017 (a796b850)](#LATEST)
3
+ * [LATEST - 23 Mar, 2017 (bce6add6)](#LATEST)
4
+ * [1.10.0 - 20 Mar, 2017 (22e22ca8)](#1.10.0)
4
5
  * [1.9.1 - 22 Feb, 2017 (3b0bd457)](#1.9.1)
5
6
  * [1.9.0 - 7 Feb, 2017 (efae323b)](#1.9.0)
6
7
  * [1.8.2 - 6 Jan, 2017 (625c17e3)](#1.8.2)
@@ -32,7 +33,34 @@
32
33
  * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
33
34
 
34
35
  ## Details
35
- ### <a name = "LATEST">LATEST - 20 Mar, 2017 (a796b850)
36
+ ### <a name = "LATEST">LATEST - 23 Mar, 2017 (bce6add6)
37
+
38
+ * (GEM) update beaker-pe version to 1.11.0 (bce6add6)
39
+
40
+ * Merge pull request #63 from shaigy/PE-19888-add-workaround-for-console-status-check-error-in-2016.1.1 (635224a5)
41
+
42
+
43
+ ```
44
+ Merge pull request #63 from shaigy/PE-19888-add-workaround-for-console-status-check-error-in-2016.1.1
45
+
46
+ PE-19888 Add workaround for 2016.1.1 console status check error
47
+ ```
48
+ * PE-19888 Add workaround for 2016.1.1 console service status check error (6cd41e45)
49
+
50
+
51
+ ```
52
+ PE-19888 Add workaround for 2016.1.1 console service status check error
53
+
54
+ During installation, a classifier-service check is done in beaker-pe
55
+ to make sure console service is up and running. The classifier status
56
+ service at the default detail level is broken in 2016.1.1 (PE-14857)
57
+ and returns an error and state "unknown". The workaround is to query
58
+ the classifier-service at 'critical' level and check for the console
59
+ service status.
60
+ ```
61
+ ### <a name = "1.10.0">1.10.0 - 20 Mar, 2017 (22e22ca8)
62
+
63
+ * (HISTORY) update beaker-pe history for gem release 1.10.0 (22e22ca8)
36
64
 
37
65
  * (GEM) update beaker-pe version to 1.10.0 (a796b850)
38
66
 
@@ -879,9 +879,14 @@ module Beaker
879
879
  return true if version_is_less(host['pe_ver'], '2015.2.0')
880
880
 
881
881
  attempts_limit = options[:pe_console_status_attempts] || 9
882
+ # Workaround for PE-14857. The classifier status service at the
883
+ # default level is broken in 2016.1.1. Instead we need to query
884
+ # the classifier service at critical level and check for service
885
+ # status
886
+ query_params = (host['pe_ver'] == '2016.1.1' ? '?level=critical' : '')
882
887
  step 'Check Console Status Endpoint' do
883
888
  match = repeat_fibonacci_style_for(attempts_limit) do
884
- output = on(host, "curl -s -k https://localhost:4433/status/v1/services --cert /etc/puppetlabs/puppet/ssl/certs/#{host}.pem --key /etc/puppetlabs/puppet/ssl/private_keys/#{host}.pem --cacert /etc/puppetlabs/puppet/ssl/certs/ca.pem", :accept_all_exit_codes => true)
889
+ output = on(host, "curl -s -k https://localhost:4433/status/v1/services#{query_params} --cert /etc/puppetlabs/puppet/ssl/certs/#{host}.pem --key /etc/puppetlabs/puppet/ssl/private_keys/#{host}.pem --cacert /etc/puppetlabs/puppet/ssl/certs/ca.pem", :accept_all_exit_codes => true)
885
890
  begin
886
891
  output = JSON.parse(output.stdout)
887
892
  match = output['classifier-service']['state'] == 'running'
@@ -3,7 +3,7 @@ module Beaker
3
3
  module PE
4
4
 
5
5
  module Version
6
- STRING = '1.10.0'
6
+ STRING = '1.11.0'
7
7
  end
8
8
 
9
9
  end
@@ -1488,6 +1488,16 @@ describe ClassMixedWithDSLInstallUtils do
1488
1488
  subject.check_console_status_endpoint({})
1489
1489
  end
1490
1490
 
1491
+ it 'add query param to curling url if version is 2016.1.1' do
1492
+ unixhost[:pe_ver] = '2016.1.1'
1493
+ allow(subject).to receive(:options).and_return({})
1494
+ allow(subject).to receive(:version_is_less).and_return(false)
1495
+ json_hash = '{ "classifier-service": { "state": "running" }, "rbac-service": { "state": "running" }, "activity-service": { "state": "running" } }'
1496
+ result = double(Beaker::Result, :stdout => "#{json_hash}")
1497
+ expect(subject).to receive(:on).with( anything, /services\?level=critical/, anything).and_return(result)
1498
+ subject.check_console_status_endpoint(unixhost)
1499
+ end
1500
+
1491
1501
  it 'yields false to repeat_fibonacci_style_for when conditions are not true' do
1492
1502
  allow(subject).to receive(:options).and_return({})
1493
1503
  allow(subject).to receive(:version_is_less).and_return(false)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker-pe
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.10.0
4
+ version: 1.11.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppetlabs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-03-21 00:00:00.000000000 Z
11
+ date: 2017-03-23 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec