beaker-puppet 0.2.0 → 0.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTc4YzBjMDRiNWE2NGYwOWQzODViZTFkZjQ1OTk2ZmYwMGU3M2I1MA==
+    Zjg2ODMyMTUxOTcyM2NmMzI4MzM5NTE0MTgyMmE0NTgyNjgxNGVjYw==
   data.tar.gz: !binary |-
-    ZTY3ZGFmZWJhZjJiODlkNTk1ZjA2YTk3NWZiMWJiMWFlOTYzNDYwMg==
+    YmVhNGE0MjlhMjdkY2IyNWFmMGIxNzVkOTQ3ZWEyOWQ4NTVlMjYzOQ==
 SHA512:
   metadata.gz: !binary |-
-    OTNlZGU0NDBlNzllNzNlMWY5ZWRmOGMxYjVlNjEwNzFjYmZkOWIyODZhNzMw
-    ZTU0ODMxNDg5MDdiMTg0ODk3NDk3ZDA5NGRhNWNiYjBiYjZkYmExYjM3NGE2
-    ZWU0MTZjNjA5OWYzMmY0NzE4MmIyOTQ5YTY4Nzk3N2ExNWZlNjE=
+    MWU5ZTVjZjI0Yzc0Y2ZjMDMyOWY3MzdkNWE3NjVlOTdlYzMyMmRhOTJkMWZh
+    ZGY2ZmQ0YTQ3NDZiZWEzMzJlZjc0NmFiODM3NDk3ZTEzN2VkMGE0ODc4MDEw
+    MjNiNTViMDU2NTU2ZTBhMjU1OGRlY2QwNWI1MDFkOWIzNDdkNTg=
   data.tar.gz: !binary |-
-    YjM0Yzc1NmUwNWM4OWEwMjU2NDBjNTgyMTQyYTllYjliYTc0MWQwYjkyN2U4
-    ZmIxOGViZDZmODEwNDExMGJiYjcwZDE3ZmMxNjNkOTQ1OTllMTQ2NGI4Y2Rk
-    MjdmYjM2MDNkNDU1MDAxM2E3OTNhYzdjMWRhMjM3NTcyNzVmZDg=
+    NDY0M2FjYzQzYWQ5MjIwMTIwMjQxM2EzNzZkOTBhM2FlNzg0ZGJmMjI4ZjM1
+    Zjc3YjM0YTQyMzE1NGQzNjk1ZmRkMmNkNTEzNjMwMmFlZGFhMzc0OGYzNmY4
+    ZDg4MWRmYzVkMTgzMTI3ODZlNDEzMWE1ODE5ZDM0MmM4YTk5ZTA=

data/lib/beaker-puppet/install_utils/foss_utils.rb

@@ -1090,23 +1090,27 @@ module Beaker
         #   install_puppet_agent_dev_repo_on(host, { :puppet_agent_sha => 'd3377feaeac173aada3a2c2cedd141eb610960a7', :puppet_agent_version => '1.1.1.225.gd3377fe'  })
         #
         # @return nil
-        def install_puppet_agent_dev_repo_on( hosts, opts )
+        def install_puppet_agent_dev_repo_on( hosts, global_opts )
 
-          opts[:puppet_agent_version] ||= opts[:version] #backward compatability
-          if not opts[:puppet_agent_version]
+          global_opts[:puppet_agent_version] ||= global_opts[:version] #backward compatability
+          if not global_opts[:puppet_agent_version]
             raise "must provide :puppet_agent_version (puppet-agent version) for install_puppet_agent_dev_repo_on"
           end
-          # TODO consolidate these values as they serve no purpose from beaker's side
-          # you could provide any values you could to one to the other
-          puppet_agent_version = opts[:puppet_agent_sha] || opts[:puppet_agent_version]
-
-          opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
-          opts[:download_url] = "#{opts[:dev_builds_url]}/puppet-agent/#{ puppet_agent_version }/repos/"
-          opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
-          opts[:puppet_collection]  ||= 'PC1'
-          release_path = opts[:download_url]
 
           block_on hosts do |host|
+            opts = global_opts.dup
+
+            # TODO consolidate these values as they serve no purpose from beaker's side
+            # you could provide any values you could to one to the other
+            puppet_agent_version = opts[:puppet_agent_sha] || opts[:puppet_agent_version]
+
+            opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
+            opts[:download_url] = "#{opts[:dev_builds_url]}/puppet-agent/#{ puppet_agent_version }/repos/"
+            opts[:copy_base_local]    ||= File.join('tmp', 'repo_configs')
+            opts[:puppet_collection]  ||= 'PC1'
+
+            release_path = opts[:download_url]
+
             variant, version, arch, codename = host['platform'].to_array
             add_role(host, 'aio') #we are installing agent, so we want aio role
             copy_dir_local = File.join(opts[:copy_base_local], variant)

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-28 00:00:00.000000000 Z
+date: 2017-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec