beaker-pe 1.10.0 → 1.11.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDgzOGU0MzZjMWJmODI4MTkyNzM3NzkyY2M5ZmExYzY5MGYxM2M4Yg==
+    N2IyMTYxOWMzNzU2MzU0ZmRmNTM2NjQ2ODRiNTk1OWYyMzk0N2YzNA==
   data.tar.gz: !binary |-
-    ZTA0YjhkODA1OWU3YTI1ODdmZjZhZWM3ZTYzYmYzMzA1NGEyOWM4Yw==
+    ZjBiMWIwYjY3NjI5MTc0NTQ4NjFjN2EzMWU2N2I0ZDYwZTZiMWRkOA==
 SHA512:
   metadata.gz: !binary |-
-    NWVmNDA0Zjg5MTE5ZWI1NjczYTIwMTVlZjQzYmZiN2VhOGNmYjRiODYwZDNi
-    MmY5MzNmYjk2OWIzMDRlZGE5OTg4OGU4NTA5NWNiYWQ3YTRlM2FkNzk3ODZi
-    YTA0NmZkYTBhNGQ4NzZkMGJmZTI1MjYxMjljMjI1MDhmNDMyZjM=
+    ZDdhZDZlYjI1OTYzMzc3M2I3YjJmMmMzMDAyOTVkM2Q4NTQ3OTY0M2IwOTZk
+    NmNlYTcxOWVkYjVjOGQ0ZjcyMGNiN2NjMjM1NWUxYjYzYjBmNGIwN2I1M2Uw
+    MGE2NWUyNWZmMDM1MmMzOGI4ZGZlODQ0NzlmMmRjZWNiZmJjNWY=
   data.tar.gz: !binary |-
-    NTI5NGJkNzdlYzViNmZhOTcxNjkxZTU4NWIwNjU1ODQzMzUzZWUzNDBiYjM1
-    ZDNmYmJmNGU5M2U5Zjk5OTRkMTUzZjg2Yjc1NTBlYzllZDcxNzkxNTY4MmM4
-    MWNhNzc4ODMxZDlhMWQzZTYyNjZjYjk0NTkyYzQzNDJmY2E0ODg=
+    MTEzMWRjMWM0ZTM1MDdiNTM2NTcwYjlhZDkxMGQwZmYwYWYzNjU3ZWNiOTYw
+    NTg1ZGNjMTM5NzJmNjQzMjRhODNkYWNkMTFkNGRkYTBiZDJhYjJlY2U3YzQ0
+    NDM2NzVmMTliMzNiNDM0YTZjZWQ2YmY4MGY2YTE3N2I0YTVjMDg=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # worker - History
 ## Tags
-* [LATEST - 20 Mar, 2017 (a796b850)](#LATEST)
+* [LATEST - 23 Mar, 2017 (bce6add6)](#LATEST)
+* [1.10.0 - 20 Mar, 2017 (22e22ca8)](#1.10.0)
 * [1.9.1 - 22 Feb, 2017 (3b0bd457)](#1.9.1)
 * [1.9.0 - 7 Feb, 2017 (efae323b)](#1.9.0)
 * [1.8.2 - 6 Jan, 2017 (625c17e3)](#1.8.2)
@@ -32,7 +33,34 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 20 Mar, 2017 (a796b850)
+### <a name = "LATEST">LATEST - 23 Mar, 2017 (bce6add6)
+
+* (GEM) update beaker-pe version to 1.11.0 (bce6add6)
+
+* Merge pull request #63 from shaigy/PE-19888-add-workaround-for-console-status-check-error-in-2016.1.1 (635224a5)
+
+
+```
+Merge pull request #63 from shaigy/PE-19888-add-workaround-for-console-status-check-error-in-2016.1.1
+
+PE-19888 Add workaround for 2016.1.1 console status check error
+```
+* PE-19888 Add workaround for 2016.1.1 console service status check error (6cd41e45)
+
+
+```
+PE-19888 Add workaround for 2016.1.1 console service status check error
+
+During installation, a classifier-service check is done in beaker-pe
+to make sure console service is up and running. The classifier status
+service at the default detail level is broken in 2016.1.1 (PE-14857)
+and returns an error and state "unknown". The workaround is to query
+the classifier-service at 'critical' level and check for the console
+service status.
+```
+### <a name = "1.10.0">1.10.0 - 20 Mar, 2017 (22e22ca8)
+
+* (HISTORY) update beaker-pe history for gem release 1.10.0 (22e22ca8)
 
 * (GEM) update beaker-pe version to 1.10.0 (a796b850)
 

data/lib/beaker-pe/install/pe_utils.rb

@@ -879,9 +879,14 @@ module Beaker
           return true if version_is_less(host['pe_ver'], '2015.2.0')
 
           attempts_limit = options[:pe_console_status_attempts] || 9
+          # Workaround for PE-14857. The classifier status service at the
+          # default level is broken in 2016.1.1. Instead we need to query
+          # the classifier service at critical level and check for service
+          # status
+          query_params = (host['pe_ver'] == '2016.1.1' ? '?level=critical' : '')
           step 'Check Console Status Endpoint' do
             match = repeat_fibonacci_style_for(attempts_limit) do
-              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)
+              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)
               begin
                 output = JSON.parse(output.stdout)
                 match = output['classifier-service']['state'] == 'running'

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.10.0'
+        STRING = '1.11.0'
       end
 
     end

data/spec/beaker-pe/install/pe_utils_spec.rb

@@ -1488,6 +1488,16 @@ describe ClassMixedWithDSLInstallUtils do
       subject.check_console_status_endpoint({})
     end
 
+    it 'add query param to curling url if version is 2016.1.1' do
+      unixhost[:pe_ver] = '2016.1.1'
+      allow(subject).to receive(:options).and_return({})
+      allow(subject).to receive(:version_is_less).and_return(false)
+      json_hash = '{ "classifier-service": { "state": "running" }, "rbac-service": { "state": "running" }, "activity-service":  { "state": "running" } }'
+      result = double(Beaker::Result, :stdout => "#{json_hash}")
+      expect(subject).to receive(:on).with( anything, /services\?level=critical/, anything).and_return(result)
+      subject.check_console_status_endpoint(unixhost)
+    end
+
     it 'yields false to repeat_fibonacci_style_for when conditions are not true' do
       allow(subject).to receive(:options).and_return({})
       allow(subject).to receive(:version_is_less).and_return(false)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec