beaker-puppet_install_helper 0.9.3 → 0.9.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 514415c55ce042a0bdaf5097cce44b7c0866f2c7
4
- data.tar.gz: e42ae3649c24399e6d465303f73a2edb9126a937
3
+ metadata.gz: 05e4a9ea911a1bb8e396daf86a75ab4dc1edfba2
4
+ data.tar.gz: fc51b63f1cd730c17eadd8d010f705c8d8e2b13c
5
5
  SHA512:
6
- metadata.gz: ad8ce92ea287febf86669f5eacc3194007cb9b1f3ad3db726fa52078b7c0d3bb47934a7e7e53ae77bd33b35c11ba408fe2e1a5761876b6a0727009cb1a32bc7a
7
- data.tar.gz: 470c62bc205b43d623854895abb8f98d3c140af324e0144a5d11e9b1f50c50f16c20b6258547d82e57ce333626e601645247e87f646d60b53afb888d44bc0df9
6
+ metadata.gz: b017170abbb33e3e9245c55185ba6631b28629fd2be41fea7a169a5d0006e653b3f2b74aca1c046d2a4b4cd588fab0137289593813aafcdfce989d85341f6b74
7
+ data.tar.gz: 51c4f620b8dab296df32bb58effe69d51c4edd5ed20af8456add07e39b7c42a58dfacd7067723348814430e31202c87e4dbdedbec0a8f664ffe20309e91ea10d
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
4
4
  The format is based on [Keep a Changelog](http://keepachangelog.com/)
5
5
  and this project adheres to [Semantic Versioning](http://semver.org/).
6
6
 
7
+ ## [0.9.4]
8
+ ### Fixed
9
+ - SHA dev builds now work on more platforms (defaults to internal build url)
10
+
7
11
  ## [0.9.3]
8
12
  ### Fixed
9
13
  - 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/).
73
77
  ### Changed
74
78
  - Add solaris for installing CA certs as well.
75
79
 
80
+ [0.9.4]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.9.3...0.9.4
76
81
  [0.9.3]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.9.2...0.9.3
77
82
  [0.9.2]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.9.1...0.9.2
78
83
  [0.9.1]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.9.0...0.9.1
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'beaker-puppet_install_helper'
3
- s.version = '0.9.3'
3
+ s.version = '0.9.4'
4
4
  s.authors = ['Puppetlabs']
5
5
  s.email = ['hunter@puppet.com']
6
6
  s.homepage = 'https://github.com/puppetlabs/beaker-puppet_install_helper'
@@ -89,12 +89,14 @@ module Beaker::PuppetInstallHelper
89
89
  options[:win_download_url] = 'http://nightlies.puppet.com/downloads/windows'
90
90
  options[:mac_download_url] = 'http://nightlies.puppet.com/downloads/mac'
91
91
  end
92
- if find_agent_sha.nil?
92
+
93
+ agent_sha = find_agent_sha
94
+ if agent_sha.nil?
93
95
  install_puppet_agent_on(hosts, options.merge(version: version))
94
96
  else
95
- opts = options.merge(puppet_agent_sha: find_agent_sha,
96
- puppet_agent_version: ENV['PUPPET_AGENT_SUITE_VERSION'] || find_agent_sha)
97
- install_puppet_agent_dev_repo_on(hosts, opts)
97
+ # If we have a development sha, assume we're testing internally
98
+ dev_builds_url = ENV['DEV_BUILDS_URL'] || 'http://builds.delivery.puppetlabs.net'
99
+ install_from_build_data_url('puppet-agent', "#{dev_builds_url}/puppet-agent/#{agent_sha}/artifacts/#{agent_sha}.yaml", hosts)
98
100
  end
99
101
 
100
102
  # XXX install_puppet_agent_on() will only add_aio_defaults_on when the
@@ -182,17 +182,21 @@ describe 'Beaker::PuppetInstallHelper' do
182
182
  end
183
183
  end
184
184
  context 'with a specific development sha' do
185
+ let (:sha) { '0ed2bbc918326263da9d97d0361a9e9303b52938' }
186
+ let (:dev_builds_url) { 'http://builds.delivery.puppetlabs.net' }
187
+ let (:agent_url) { "#{dev_builds_url}/puppet-agent/#{sha}/artifacts/#{sha}.yaml" }
188
+
185
189
  it 'uses a development repo' do
186
- ENV['BEAKER_PUPPET_AGENT_SHA'] = '0ed2bbc918326263da9d97d0361a9e9303b52938'
187
- expect(subject).to receive(:install_puppet_agent_dev_repo_on).with(hosts, puppet_agent_sha: '0ed2bbc918326263da9d97d0361a9e9303b52938', puppet_agent_version: '0ed2bbc918326263da9d97d0361a9e9303b52938')
190
+ ENV['BEAKER_PUPPET_AGENT_SHA'] = sha
191
+ allow(subject).to receive(:install_from_build_data_url).with('puppet-agent', agent_url, hosts).and_return true
188
192
  expect(subject).to receive(:add_aio_defaults_on).with(hosts)
189
193
  expect(subject).to receive(:add_puppet_paths_on).with(hosts)
190
194
  subject.run_puppet_install_helper_on(hosts)
191
195
  end
192
196
  it 'uses a development repo with suite version and sha' do
193
- ENV['BEAKER_PUPPET_AGENT_SHA'] = '0ed2bbc918326263da9d97d0361a9e9303b52938'
197
+ ENV['BEAKER_PUPPET_AGENT_SHA'] = sha
194
198
  ENV['PUPPET_AGENT_SUITE_VERSION'] = '5.5.0.152.g0ed2bbc'
195
- expect(subject).to receive(:install_puppet_agent_dev_repo_on).with(hosts, puppet_agent_sha: '0ed2bbc918326263da9d97d0361a9e9303b52938', puppet_agent_version: '5.5.0.152.g0ed2bbc')
199
+ allow(subject).to receive(:install_from_build_data_url).with('puppet-agent', agent_url, hosts).and_return true
196
200
  expect(subject).to receive(:add_aio_defaults_on).with(hosts)
197
201
  expect(subject).to receive(:add_puppet_paths_on).with(hosts)
198
202
  subject.run_puppet_install_helper_on(hosts)
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker-puppet_install_helper
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.3
4
+ version: 0.9.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppetlabs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-05-02 00:00:00.000000000 Z
11
+ date: 2018-05-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec