beaker-pe 1.8.0 → 1.8.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzU2YTU0MGFkMGFiZjliMGU4MTQ2NGM5NThkNDBiZTM5NGJhMmIyOQ==
+    ZTZmYWJlMDhjOWFmNTkyNGJhODBhY2QyMGQ3Y2M4YjAzNDVlN2UwNQ==
   data.tar.gz: !binary |-
-    NzFhYjVmY2NhMjZjMDY3ODM5NDhhMDgxYjU2ZmE4N2YyNmQyZGQwOQ==
+    ZTE2NjhlNWYxNTY5Y2VmYjQwZGRjMDMyNzNkOGZjMTE3ZDU3ZGQ2MA==
 SHA512:
   metadata.gz: !binary |-
-    MjA2YWRkMTBhMDg4YjFlNWE2Y2JiYTk1YThhZWU2ZDJmODM1YmQwYmIzN2Mz
-    ZGEzNDZiNjhhYjcxNDliNzM0YWU2MDYxODZmM2RhNjJiM2FjZTViYjQ1ZjM1
-    MWVhZDYyYzdmMWNlZjg4ZmY1MzczMWVmNTliYTI2MzhjOTQ5ZWM=
+    NmMyMGI4YWM3NjBkNDlhZDZmYWQ0MTkxNmE3ODA3MjI1ZTFmODE2MmJmMzJl
+    MjZjYzAyYjY3ZGYyYWQ4NzQ5MGMyOThkYmMwZDc2YWY3YzEzYTM0OWRmMmQ3
+    NGJmMzhhODViY2U0YTdlODdiODFiNTBjZTIxNmEwYmFjODE4Yzk=
   data.tar.gz: !binary |-
-    MDNlZjMxZDQ3Yzk3ODU1ZDllMTE1MjFmM2M2ZTY2ODk3MmE1NDUyYTc1Y2U3
-    NmFmYTE0YTU5OWMxZjI4YTAyMDBlMjg3YTFjYzJlNzE2ZDcwZmNlZDBmMTI0
-    Y2VmN2RiMTJjMGI1MDRlZDNhOGZhMzY3NTI1ZTZhYjIyNjkwMTE=
+    OGJmOWU0NGVkMmZlYTdhZjYwNGIzNzA0NGMyOTY5Y2NjODg1YjYxOWFlYWQw
+    NGMzMjQyNmFmNzQzYWJjNDAzNDE3YmE3NTVhZDk5NjQ2MTk4M2QwZGMzY2Q1
+    YmRmMTMzMTI0MDhiZTMwZmZiMGU3Njg2YzE0ZDQzNzMxZWQyOGY=

data/HISTORY.md

@@ -1,6 +1,7 @@
 # default - History
 ## Tags
-* [LATEST - 30 Dec, 2016 (75d22036)](#LATEST)
+* [LATEST - 30 Dec, 2016 (7a9c2c4a)](#LATEST)
+* [1.8.0 - 30 Dec, 2016 (5a37fef7)](#1.8.0)
 * [1.7.0 - 20 Dec, 2016 (99e6bbde)](#1.7.0)
 * [1.6.1 - 22 Nov, 2016 (52e30609)](#1.6.1)
 * [1.6.0 - 16 Nov, 2016 (0da1b64c)](#1.6.0)
@@ -27,7 +28,23 @@
 * [0.1.0 - 29 Feb, 2016 (4fc88d8c)](#0.1.0)
 
 ## Details
-### <a name = "LATEST">LATEST - 30 Dec, 2016 (75d22036)
+### <a name = "LATEST">LATEST - 30 Dec, 2016 (7a9c2c4a)
+
+* (GEM) update beaker-pe version to 1.8.1 (7a9c2c4a)
+
+* (BKR-831) Remove aio_agent_build as version source (#46) (2267d3a2)
+
+
+```
+(BKR-831) Remove aio_agent_build as version source (#46)
+
+This commit removes the `aio_agent_build` fact as a data source for
+the `get_puppet_agent_version`. If the version is not specified, then
+then only the `aio_agent_version` value is used as a fail over.
+```
+### <a name = "1.8.0">1.8.0 - 30 Dec, 2016 (5a37fef7)
+
+* (HISTORY) update beaker-pe history for gem release 1.8.0 (5a37fef7)
 
 * (GEM) update beaker-pe version to 1.8.0 (75d22036)
 

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

@@ -576,11 +576,11 @@ module Beaker
         end
 
         # Gets the puppet-agent version, hopefully from the host or local options.
-        # Will fall back to reading the `aio_agent_build` property on the master
+        # Will fall back to reading the `aio_agent_version` property on the master
         # if neither of those two options are passed
         #
         # @note This method does have a side-effect: if it reads the
-        #   `aio_agent_build` property from master, it will store it in the local
+        #   `aio_agent_version` property from master, it will store it in the local
         #   options hash so that it won't have to do this more than once.
         #
         # @param [Beaker::Host] host Host to get puppet-agent for
@@ -598,9 +598,7 @@ module Beaker
           facts_result = on(master, 'puppet facts')
           raise ArgumentError, fail_message if facts_result.exit_code != 0
           facts_hash = JSON.parse(facts_result.stdout.chomp)
-          puppet_agent_version   = facts_hash['values']['aio_agent_build']
-          # released masters don't have _build fact, fallback to _version
-          puppet_agent_version ||= facts_hash['values']['aio_agent_version']
+          puppet_agent_version = facts_hash['values']['aio_agent_version']
           raise ArgumentError, fail_message if puppet_agent_version.nil?
           logger.warn("#{log_prefix} Read puppet-agent version #{puppet_agent_version} from master")
           # saving so that we don't have to query the master more than once

data/lib/beaker-pe/version.rb

@@ -3,7 +3,7 @@ module Beaker
     module PE
 
       module Version
-        STRING = '1.8.0'
+        STRING = '1.8.1'
       end
 
     end

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

@@ -1355,7 +1355,7 @@ describe ClassMixedWithDSLInstallUtils do
         json_hash    = mock_values[:json_hash]
         pa_version   = mock_values[:pa_version]
         pa_version ||= 'pa_version_' + rand(10 ** 5).to_s.rjust(5,'0') # 5 digit random number string
-        json_hash  ||= "{ \"values\": { \"aio_agent_build\": \"#{pa_version}\" }}"
+        json_hash  ||= "{ \"values\": { \"aio_agent_version\": \"#{pa_version}\" }}"
 
         allow( subject ).to receive( :master ).and_return( {} )
         result_mock = Object.new
@@ -1377,11 +1377,6 @@ describe ClassMixedWithDSLInstallUtils do
         expect( local_options_hash[:puppet_agent_version] ).to be === pa_version
       end
 
-      it 'falls back on aio_agent_version if _build is not available' do
-        pa_version = 'your_face_13587'
-        test_setup( :json_hash => "{ \"values\": { \"aio_agent_version\": \"#{pa_version}\" }}" )
-        expect( subject.get_puppet_agent_version( {} ) ).to be === pa_version
-      end
     end
 
     context 'failures' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-pe
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Puppetlabs