beaker-puppet 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8255b145e80f781db25ff60741e1705eb3c7b3e
-  data.tar.gz: f4daaec756f930f3756124e3af7dca33ba965863
+  metadata.gz: 025f9370e1244e63e10ab6629c1069289a801c11
+  data.tar.gz: 71d17c2a14d18f791ec4d1744e7973f7c0487016
 SHA512:
-  metadata.gz: 366e0bf4b1ef15dd623f8a7c76544ea4fc76195dd3a1b1eef9559e0ba190aedd95a05cf487ae74eddd492cb6f132abc0a056576d31dfd7ca31af96f224b9a1a0
-  data.tar.gz: 1a612e0bc6bb1181f9ee118e37aff99a95037df9b7da4976475874b0761d79e79ec177a2039d587c44bd54b2b107eff326ad079e7408cdc763bad15968a3b6b2
+  metadata.gz: 8f3acb63dacd5f6d3944c00d79ce8919c7cb74d9777421d657e72edf02496682cea0b635740a5597a11af62ee193bbd7231b4c865163e51b737bda7c97eb6146
+  data.tar.gz: 9c8f52ec56ef1498dc66cdc514c6733d046c268ca77525a326416a08f5246c51c2370ab75c0b15b9380ad13a96e91ac2ab5126765d934e4aefbf562a0ca019de

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

@@ -8,12 +8,16 @@ module Beaker
 
         #Here be the default download URLs
         FOSS_DEFAULT_DOWNLOAD_URLS = {
-          :win_download_url       => "http://downloads.puppetlabs.com/windows",
-          :mac_download_url       => "http://downloads.puppetlabs.com/mac",
-          :pe_promoted_builds_url => "http://pm.puppetlabs.com",
-          :release_apt_repo_url   => "http://apt.puppetlabs.com",
-          :release_yum_repo_url   => "http://yum.puppetlabs.com",
-          :dev_builds_url         => "http://builds.delivery.puppetlabs.net",
+          :win_download_url         => "http://downloads.puppetlabs.com/windows",
+          :mac_download_url         => "http://downloads.puppetlabs.com/mac",
+          :pe_promoted_builds_url   => "http://pm.puppetlabs.com",
+          :release_apt_repo_url     => "http://apt.puppetlabs.com",
+          :release_yum_repo_url     => "http://yum.puppetlabs.com",
+          :nightly_apt_repo_url     => "http://nightlies.puppet.com/apt",
+          :nightly_yum_repo_url     => "http://nightlies.puppet.com/yum",
+          :nightly_win_download_url => "http://nightlies.puppet.com/downloads/windows",
+          :nightly_mac_download_url => "http://nightlies.puppet.com/downloads/mac",
+          :dev_builds_url           => "http://builds.delivery.puppetlabs.net",
         }
 
         #Here be the pathing and default values for FOSS installs

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

@@ -252,7 +252,7 @@ module Beaker
         # @return nil
         # @raise [StandardError] When encountering an unsupported platform by default, or if gem cannot be found when default_action => 'gem_install'
         # @raise [FailTest] When error occurs during the actual installation process
-        def install_puppet_on(hosts, opts={})
+        def install_puppet_on(hosts, opts = options)
           opts = FOSS_DEFAULT_DOWNLOAD_URLS.merge(opts)
 
           # If version isn't specified assume the latest in the 3.x series
@@ -594,7 +594,12 @@ module Beaker
         # @api private
         def msi_link_path(host, opts)
           if opts[:puppet_collection] && opts[:puppet_collection].match(/puppet\d*/)
-            link = "#{opts[:win_download_url]}/#{opts[:puppet_collection]}/#{host['dist']}.msi"
+            url = if opts[:puppet_collection].match(/-nightly$/)
+                    opts[:nightly_win_download_url]
+                  else
+                    opts[:win_download_url]
+                  end
+            link = "#{url}/#{opts[:puppet_collection]}/#{host['dist']}.msi"
           else
             link = "#{opts[:win_download_url]}/#{host['dist']}.msi"
           end
@@ -727,7 +732,12 @@ module Beaker
             variant, version, arch, codename = host['platform'].to_array
 
             if opts[:puppet_collection].match(/puppet\d*/)
-              download_url = "#{opts[:mac_download_url]}/#{opts[:puppet_collection]}/#{version}/#{arch}"
+              url = if opts[:puppet_collection].match(/-nightly$/)
+                      opts[:nightly_mac_download_url]
+                    else
+                      opts[:mac_download_url]
+                    end
+              download_url = "#{url}/#{opts[:puppet_collection]}/#{version}/#{arch}"
             else
               download_url = "#{opts[:mac_download_url]}/#{version}/#{opts[:puppet_collection]}/#{arch}"
             end
@@ -942,8 +952,13 @@ module Beaker
                 version = '7'
               end
               if repo_name.match(/puppet\d*/)
+                url = if repo_name.match(/-nightly$/)
+                        opts[:nightly_yum_repo_url]
+                      else
+                        opts[:release_yum_repo_url]
+                      end
                 remote = "%s/%s/%s-release-%s-%s.noarch.rpm" %
-                  [opts[:release_yum_repo_url], repo_name, repo_name, variant_url_value, version]
+                  [url, repo_name, repo_name, variant_url_value, version]
               else
                 repo_name = '-' + repo_name unless repo_name.empty?
                 remote = "%s/puppetlabs-release%s-%s-%s.noarch.rpm" %
@@ -973,8 +988,13 @@ module Beaker
 
             when /^(debian|ubuntu|cumulus|huaweios)$/
               if repo_name.match(/puppet\d*/)
+                url = if repo_name.match(/-nightly$/)
+                        opts[:nightly_apt_repo_url]
+                      else
+                        opts[:release_apt_repo_url]
+                      end
                 remote = "%s/%s-release-%s.deb" %
-                  [opts[:release_apt_repo_url], repo_name, codename]
+                  [url, repo_name, codename]
               else
                 repo_name = '-' + repo_name unless repo_name.empty?
                 remote = "%s/puppetlabs-release%s-%s.deb" %

data/lib/beaker-puppet/version.rb

@@ -1,3 +1,3 @@
 module BeakerPuppet
-  VERSION = '0.15.1'
+  VERSION = '0.15.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec