beaker-puppet_install_helper 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 514415c55ce042a0bdaf5097cce44b7c0866f2c7
-  data.tar.gz: e42ae3649c24399e6d465303f73a2edb9126a937
+  metadata.gz: 05e4a9ea911a1bb8e396daf86a75ab4dc1edfba2
+  data.tar.gz: fc51b63f1cd730c17eadd8d010f705c8d8e2b13c
 SHA512:
-  metadata.gz: ad8ce92ea287febf86669f5eacc3194007cb9b1f3ad3db726fa52078b7c0d3bb47934a7e7e53ae77bd33b35c11ba408fe2e1a5761876b6a0727009cb1a32bc7a
-  data.tar.gz: 470c62bc205b43d623854895abb8f98d3c140af324e0144a5d11e9b1f50c50f16c20b6258547d82e57ce333626e601645247e87f646d60b53afb888d44bc0df9
+  metadata.gz: b017170abbb33e3e9245c55185ba6631b28629fd2be41fea7a169a5d0006e653b3f2b74aca1c046d2a4b4cd588fab0137289593813aafcdfce989d85341f6b74
+  data.tar.gz: 51c4f620b8dab296df32bb58effe69d51c4edd5ed20af8456add07e39b7c42a58dfacd7067723348814430e31202c87e4dbdedbec0a8f664ffe20309e91ea10d

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.4]
+### Fixed
+- SHA dev builds now work on more platforms (defaults to internal build url)
+
 ## [0.9.3]
 ### Fixed
 - Windows needs to use nightlies.puppet.com for nightly builds because the nightlies are not published to downloads.puppet.com
@@ -73,6 +77,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Add solaris for installing CA certs as well.
 
+[0.9.4]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.9.3...0.9.4
 [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

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.3'
+  s.version     = '0.9.4'
   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

@@ -89,12 +89,14 @@ module Beaker::PuppetInstallHelper
         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?
+
+      agent_sha = find_agent_sha
+      if agent_sha.nil?
         install_puppet_agent_on(hosts, options.merge(version: version))
       else
-        opts = options.merge(puppet_agent_sha: find_agent_sha,
-                             puppet_agent_version: ENV['PUPPET_AGENT_SUITE_VERSION'] || find_agent_sha)
-        install_puppet_agent_dev_repo_on(hosts, opts)
+        # If we have a development sha, assume we're testing internally
+        dev_builds_url = ENV['DEV_BUILDS_URL'] || 'http://builds.delivery.puppetlabs.net'
+        install_from_build_data_url('puppet-agent', "#{dev_builds_url}/puppet-agent/#{agent_sha}/artifacts/#{agent_sha}.yaml", hosts)
       end
 
       # XXX install_puppet_agent_on() will only add_aio_defaults_on when the

data/spec/unit/beaker/puppet_install_helper_spec.rb

@@ -182,17 +182,21 @@ describe 'Beaker::PuppetInstallHelper' do
           end
         end
         context 'with a specific development sha' do
+          let (:sha) { '0ed2bbc918326263da9d97d0361a9e9303b52938' }
+          let (:dev_builds_url) { 'http://builds.delivery.puppetlabs.net' }
+          let (:agent_url) { "#{dev_builds_url}/puppet-agent/#{sha}/artifacts/#{sha}.yaml" }
+
           it 'uses a development repo' do
-            ENV['BEAKER_PUPPET_AGENT_SHA'] = '0ed2bbc918326263da9d97d0361a9e9303b52938'
-            expect(subject).to receive(:install_puppet_agent_dev_repo_on).with(hosts, puppet_agent_sha: '0ed2bbc918326263da9d97d0361a9e9303b52938', puppet_agent_version: '0ed2bbc918326263da9d97d0361a9e9303b52938')
+            ENV['BEAKER_PUPPET_AGENT_SHA'] = sha
+            allow(subject).to receive(:install_from_build_data_url).with('puppet-agent', agent_url, hosts).and_return true
             expect(subject).to receive(:add_aio_defaults_on).with(hosts)
             expect(subject).to receive(:add_puppet_paths_on).with(hosts)
             subject.run_puppet_install_helper_on(hosts)
           end
           it 'uses a development repo with suite version and sha' do
-            ENV['BEAKER_PUPPET_AGENT_SHA'] = '0ed2bbc918326263da9d97d0361a9e9303b52938'
+            ENV['BEAKER_PUPPET_AGENT_SHA'] = sha
             ENV['PUPPET_AGENT_SUITE_VERSION'] = '5.5.0.152.g0ed2bbc'
-            expect(subject).to receive(:install_puppet_agent_dev_repo_on).with(hosts, puppet_agent_sha: '0ed2bbc918326263da9d97d0361a9e9303b52938', puppet_agent_version: '5.5.0.152.g0ed2bbc')
+            allow(subject).to receive(:install_from_build_data_url).with('puppet-agent', agent_url, hosts).and_return true
             expect(subject).to receive(:add_aio_defaults_on).with(hosts)
             expect(subject).to receive(:add_puppet_paths_on).with(hosts)
             subject.run_puppet_install_helper_on(hosts)

metadata

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