beaker-puppet 1.18.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e36de0d3a26174df84e75c1aac59079ea1d29460
-  data.tar.gz: 4a9fc4ae22a19955d01a3ae73900dd9a634aa737
+  metadata.gz: 77ebe95a8532d7186326306367ee373a240b2557
+  data.tar.gz: f9bcfc9d46af18526d7b103759f9cc61d8a5413c
 SHA512:
-  metadata.gz: 441d745d701b6f5012d8f83e4c347efbb32da3e0aff93fa479d64a0f0598a0e4051f8f945a7d98110eb01bbc54ad23db26e9d1c48bd6486ca64742ec460ea70a
-  data.tar.gz: 7f2f7b46616579a86970ec13a727e9b472a33435e9e13d9de6e9d5f508ab881746d7ca24045c089585bb259a089b7e716df5073728f2651cc4fc4dc741fc988f
+  metadata.gz: b569d0795780967e3ea7429ad05c31e14ca389d67c750f31b9d693e46a46617f9f9738c3d3cc38f501cdf90d19b4f2dd077e491bebd48ce2a7bdfdc0e0d85073
+  data.tar.gz: 001f1315f8991e1fd4125a72ab400b5aa91828e1b6c09797a51008296d63963c9c0fd571adf8c7bcee51f6672e58686484f55c6ed216358f7799cc6b6061dc9c

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

@@ -389,45 +389,45 @@ module Beaker
 
             # If inside the Puppet VPN, install from development builds.
             if opts[:puppet_agent_version] && opts[:puppet_agent_version] != 'latest' && dev_builds_accessible_on?(host, opts[:dev_builds_url])
-              return install_puppet_agent_from_dev_builds_on(host, opts[:puppet_agent_version])
-            end
-
-            if opts[:puppet_agent_version] == 'latest'
-              opts[:puppet_collection] += '-nightly' unless opts[:puppet_collection].end_with? '-nightly'
-
-              # Since we have modified the collection, we don't want to pass `latest`
-              # in to `install_package` as the version. That'll fail. Instead, if
-              # we pass `nil`, `install_package` will just install the latest available
-              # package version from the enabled repo.
-              opts.delete(:puppet_agent_version)
-              opts.delete(:version)
-            end
-
-            case host['platform']
-            when /el-|redhat|fedora|sles|centos|cisco_/
-              package_name = 'puppet-agent'
-              package_name << "-#{opts[:puppet_agent_version]}" if opts[:puppet_agent_version]
-            when /debian|ubuntu|cumulus|huaweios/
-              package_name = 'puppet-agent'
-              package_name << "=#{opts[:puppet_agent_version]}-1#{host['platform'].codename}" if opts[:puppet_agent_version]
-            when /windows/
-              install_puppet_agent_from_msi_on(host, opts)
-            when /osx/
-              install_puppet_agent_from_dmg_on(host, opts)
+              install_puppet_agent_from_dev_builds_on(host, opts[:puppet_agent_version])
             else
-              if opts[:default_action] == 'gem_install'
-                opts[:version] = opts[:puppet_gem_version]
-                install_puppet_from_gem_on(host, opts)
-                on host, "echo '' >> #{host.puppet['hiera_config']}"
+              if opts[:puppet_agent_version] == 'latest'
+                opts[:puppet_collection] += '-nightly' unless opts[:puppet_collection].end_with? '-nightly'
+
+                # Since we have modified the collection, we don't want to pass `latest`
+                # in to `install_package` as the version. That'll fail. Instead, if
+                # we pass `nil`, `install_package` will just install the latest available
+                # package version from the enabled repo.
+                opts.delete(:puppet_agent_version)
+                opts.delete(:version)
+              end
+
+              case host['platform']
+              when /el-|redhat|fedora|sles|centos|cisco_/
+                package_name = 'puppet-agent'
+                package_name << "-#{opts[:puppet_agent_version]}" if opts[:puppet_agent_version]
+              when /debian|ubuntu|cumulus|huaweios/
+                package_name = 'puppet-agent'
+                package_name << "=#{opts[:puppet_agent_version]}-1#{host['platform'].codename}" if opts[:puppet_agent_version]
+              when /windows/
+                install_puppet_agent_from_msi_on(host, opts)
+              when /osx/
+                install_puppet_agent_from_dmg_on(host, opts)
               else
-                raise "install_puppet_agent_on() called for unsupported " +
-                      "platform '#{host['platform']}' on '#{host.name}'"
+                if opts[:default_action] == 'gem_install'
+                  opts[:version] = opts[:puppet_gem_version]
+                  install_puppet_from_gem_on(host, opts)
+                  on host, "echo '' >> #{host.puppet['hiera_config']}"
+                else
+                  raise "install_puppet_agent_on() called for unsupported " +
+                        "platform '#{host['platform']}' on '#{host.name}'"
+                end
               end
-            end
 
-            if package_name
-              install_puppetlabs_release_repo( host, opts[:puppet_collection] , opts)
-              host.install_package( package_name )
+              if package_name
+                install_puppetlabs_release_repo( host, opts[:puppet_collection] , opts)
+                host.install_package( package_name )
+              end
             end
           end
         end

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '1.18.0'
+  VERSION = '1.18.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.18.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec