beaker-puppet_install_helper 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e59c738347888de465454b206af674667617829c
-  data.tar.gz: 92cb8764cf7459094e8e35f2b22b8fa6e144a1fd
+  metadata.gz: 514415c55ce042a0bdaf5097cce44b7c0866f2c7
+  data.tar.gz: e42ae3649c24399e6d465303f73a2edb9126a937
 SHA512:
-  metadata.gz: 02641d78eb28596a1055d289237c96128d115aeeb683a18db5e6f16eafa319229d31da988bfee11bee57338407ffb8c01d3d2939d37cd8359040c2aeb0768f38
-  data.tar.gz: 6d0ce9d0c14c0647d8186b432597f59d8765c2d9331918d199534ce1d37b4d07544180f97691a7bc33a123d1a7ec0fd0d6b181992a3b0ba982417b3a4be45db9
+  metadata.gz: ad8ce92ea287febf86669f5eacc3194007cb9b1f3ad3db726fa52078b7c0d3bb47934a7e7e53ae77bd33b35c11ba408fe2e1a5761876b6a0727009cb1a32bc7a
+  data.tar.gz: 470c62bc205b43d623854895abb8f98d3c140af324e0144a5d11e9b1f50c50f16c20b6258547d82e57ce333626e601645247e87f646d60b53afb888d44bc0df9

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.9.3]
+### Fixed
+- Windows needs to use nightlies.puppet.com for nightly builds because the nightlies are not published to downloads.puppet.com
+
 ## [0.9.2]
 ### Fixed
 - Fix debian nightly collection installation.
@@ -69,6 +73,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Add solaris for installing CA certs as well.
 
+[0.9.3]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.9.2...0.9.3
 [0.9.2]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.9.1...0.9.2
 [0.9.1]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.9.0...0.9.1
 [0.9.0]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.8.0...0.9.0

data/beaker-puppet_install_helper.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'beaker-puppet_install_helper'
-  s.version     = '0.9.2'
+  s.version     = '0.9.3'
   s.authors     = ['Puppetlabs']
   s.email       = ['hunter@puppet.com']
   s.homepage    = 'https://github.com/puppetlabs/beaker-puppet_install_helper'

data/lib/beaker/puppet_install_helper.rb

@@ -83,9 +83,13 @@ module Beaker::PuppetInstallHelper
         end
       end
     when 'agent'
-      if find_agent_sha.nil?
+      if ENV['BEAKER_PUPPET_COLLECTION'] =~ /-nightly$/
         # Workaround for RE-10734
-        options[:release_apt_repo_url] = "http://apt.puppetlabs.com/#{ENV['BEAKER_PUPPET_COLLECTION']}" if ENV['BEAKER_PUPPET_COLLECTION'] =~ /-nightly$/
+        options[:release_apt_repo_url] = "http://apt.puppetlabs.com/#{ENV['BEAKER_PUPPET_COLLECTION']}"
+        options[:win_download_url] = 'http://nightlies.puppet.com/downloads/windows'
+        options[:mac_download_url] = 'http://nightlies.puppet.com/downloads/mac'
+      end
+      if find_agent_sha.nil?
         install_puppet_agent_on(hosts, options.merge(version: version))
       else
         opts = options.merge(puppet_agent_sha: find_agent_sha,

data/spec/unit/beaker/puppet_install_helper_spec.rb

@@ -166,7 +166,12 @@ describe 'Beaker::PuppetInstallHelper' do
             it "installs puppet-agent from #{collection} repo" do
               ENV['BEAKER_PUPPET_COLLECTION'] = collection
               if collection =~ /-nightly$/
-                expect(subject).to receive(:install_puppet_agent_on).with(hosts, release_apt_repo_url: "http://apt.puppetlabs.com/puppet6-nightly", version: nil)
+                expect(subject).to receive(:install_puppet_agent_on).with(
+                  hosts,
+                  release_apt_repo_url: "http://apt.puppetlabs.com/puppet6-nightly",
+                  win_download_url: "http://nightlies.puppet.com/downloads/windows",
+                  mac_download_url: "http://nightlies.puppet.com/downloads/mac",
+                  version: nil)
               else
                 expect(subject).to receive(:install_puppet_agent_on).with(hosts, version: nil)
               end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-30 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec