beaker-puppet_install_helper 0.9.0 → 0.9.1

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: 4671087136928e9adda784a24f1ea5577e5b6b68
4
- data.tar.gz: 5f785c6f41fd90a0a7b0c578b321910c5fec3c77
3
+ metadata.gz: ec9fa976af3946c77519c2a70ce1432db3b0c69b
4
+ data.tar.gz: 595ab848ddc5c34ebfdc8a7ebfe44aa62630b033
5
5
  SHA512:
6
- metadata.gz: cc2780d965a5f86cf072b373bf3b9da60cae36dd123a84b3b06fed1b9cd60e607fa10d81fa1387a041988409e2b69e6ada775ec984ad81ce1da74df8e7789f73
7
- data.tar.gz: f898be72b22bfbaa300370cd3df8f7eaeb4d60377a45404a938bfb97c55f69cbfcb4f8474e777349f9070fb95e5d4c28d44ad96b9e06dd8d85712a68ed6857c3
6
+ metadata.gz: ff0b6ed2432832542325c4ee19c0de9dbc15e245ec322afcde3e0f652a62e4b9a814e74b96e1b2a98a41c9124ee7e269f073eb643005dbae7716215ee77023dd
7
+ data.tar.gz: 4c28e0ffc4ed913c231d77482b8df9393843e6d6eff4ecc998a428aac911411543a0bc6dcad854c2ea5cedcb6585561d2f1e23a0952e32843586ca3bb69f903c
data/CHANGELOG.md CHANGED
@@ -4,6 +4,11 @@ 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.1]
8
+ ### Fixed
9
+ - Pass `BEAKER_PE_VER` to `install_pe_on()` for the PE version rather than `BEAKER_PUPPET_AGENT_VERSION` or `PUPPET_INSTALL_VERSION`
10
+ - Pass `BEAKER_PUPPET_AGENT_VERSION` to `install_pe_on()` as the agent version to be installed alongside PE.
11
+
7
12
  ## [0.9.0]
8
13
  ### Changed
9
14
  - Use `BEAKER_IS_PE` instead of `PUPPET_INSTALL_TYPE` to specify whether a run should be PE or agent.
@@ -14,7 +19,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
14
19
  ### Fixed
15
20
  - Beaker only cares about the SHA and no longer cares about `PUPPET_AGENT_SUITE_VERSION` so deprecating that variable. See (the beaker source)[https://github.com/puppetlabs/beaker-puppet/blob/63ea32a0d7caa8f261c533b020625de19569f971/lib/beaker-puppet/install_utils/foss_utils.rb#L1150-L1152]
16
21
 
17
- ## [0.8.0]
22
+ ## [0.8.0] - Yanked
18
23
  ### Changed
19
24
  - Changed the default `PUPPET_INSTALL_TYPE` from "agent" (puppet 4) to "puppet5"
20
25
 
@@ -60,6 +65,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
60
65
  ### Changed
61
66
  - Add solaris for installing CA certs as well.
62
67
 
68
+ [0.9.1]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.9.0...0.9.1
69
+ [0.9.0]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.8.0...0.9.0
63
70
  [0.8.0]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.7.1...0.8.0
64
71
  [0.7.1]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.7.0...0.7.1
65
72
  [0.7.0]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.6.0...0.7.0
data/README.md CHANGED
@@ -9,6 +9,7 @@ The way to use this is to declare either `run_puppet_install_helper()` or `run_p
9
9
  - `BEAKER_PUPPET_COLLECTION=<puppet collection>` will install the specified `BEAKER_PUPPET_AGENT_VERSION` from the specified collection. Valid values are `pc1`, `puppet5`, `puppet6-nightly` etc. This may change with time.
10
10
  - `BEAKER_PUPPET_AGENT_VERSION=<version>` to specify
11
11
  - `BEAKER_IS_PE=<yes or no>` may be used to force a nodeset to be PE or not, regardless of the nodeset `type` or absence thereof.
12
+ - `BEAKER_PE_VER=<pe version>` may be used to specify the PE version for masters. Eg: `BEAKER_PE_VER=2017.3.5`
12
13
  - `BEAKER_PUPPET_AGENT_SHA=<sha>` may be used in order to use a development puppet-agent package.
13
14
  - `PUPPET_INSTALL_TYPE=foss` may be used to install foss puppet 3.x, but is deprecated and should not be used.
14
15
 
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'beaker-puppet_install_helper'
3
- s.version = '0.9.0'
3
+ s.version = '0.9.1'
4
4
  s.authors = ['Puppetlabs']
5
5
  s.email = ['hunter@puppet.com']
6
6
  s.homepage = 'https://github.com/puppetlabs/beaker-puppet_install_helper'
@@ -31,7 +31,8 @@ module Beaker::PuppetInstallHelper
31
31
  case type
32
32
  when 'pe'
33
33
  # These will skip hosts that are not supported
34
- install_pe_on(Array(hosts), options.merge('pe_ver' => version))
34
+ install_pe_on(Array(hosts), options.merge('pe_ver' => ENV['BEAKER_PE_VER'],
35
+ 'puppet_agent_version' => version))
35
36
  install_ca_certs_on(Array(hosts))
36
37
  when 'foss'
37
38
  opts = options.merge(version: version,
@@ -36,6 +36,7 @@ describe 'Beaker::PuppetInstallHelper' do
36
36
  ENV.delete('BEAKER_PUPPET_COLLECTION')
37
37
  ENV.delete('BEAKER_PUPPET_AGENT_VERSION')
38
38
  ENV.delete('BEAKER_PUPPET_AGENT_SHA')
39
+ ENV.delete('BEAKER_PE_VER')
39
40
  end
40
41
  describe '#run_puppet_install_helper' do
41
42
  before :each do
@@ -66,14 +67,14 @@ describe 'Beaker::PuppetInstallHelper' do
66
67
  w2k3 = { 'platform' => 'windows-2003r2-64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne' }
67
68
  win_hosts = [w2k3]
68
69
  expect(subject).to receive(:default).and_return(double(is_pe?: true))
69
- expect(subject).to receive(:install_pe_on).with([w2k3.merge('install_32' => true)], 'pe_ver' => nil)
70
+ expect(subject).to receive(:install_pe_on).with([w2k3.merge('install_32' => true)], 'pe_ver' => nil, 'puppet_agent_version' => nil)
70
71
  expect(subject).to receive(:create_cert_on_host).exactly(3).times
71
72
  expect(subject).to receive(:add_windows_cert).exactly(3).times
72
73
  subject.run_puppet_install_helper_on(win_hosts)
73
74
  end
74
75
  it 'uses PE by default for PE nodes' do
75
76
  expect(subject).to receive(:default).and_return(hosts[1])
76
- expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => nil)
77
+ expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => nil, 'puppet_agent_version' => nil)
77
78
  subject.run_puppet_install_helper_on(hosts)
78
79
  end
79
80
  end
@@ -193,26 +194,35 @@ describe 'Beaker::PuppetInstallHelper' do
193
194
  context 'for PE' do
194
195
  it 'uses PE when default is a pe host' do
195
196
  expect(subject).to receive(:default).and_return(hosts[1])
196
- expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => nil)
197
+ expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => nil, 'puppet_agent_version' => nil)
197
198
  subject.run_puppet_install_helper_on(hosts)
198
199
  end
199
200
  it 'uses PE explicitly' do
200
201
  ENV['PUPPET_INSTALL_TYPE'] = 'pe'
201
- expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => nil)
202
+ expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => nil, 'puppet_agent_version' => nil)
202
203
  subject.run_puppet_install_helper_on(hosts)
203
204
  end
204
205
  it 'uses PE with a version' do
205
206
  ENV['PUPPET_INSTALL_TYPE'] = 'pe'
206
- ENV['PUPPET_INSTALL_VERSION'] = '3.8.1'
207
- expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => '3.8.1')
207
+ ENV['BEAKER_PE_VER'] = '3.8.1'
208
+ expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => '3.8.1', 'puppet_agent_version' => nil)
209
+ subject.run_puppet_install_helper_on(hosts)
210
+ end
211
+ it 'uses PE with an agent version' do
212
+ ENV['PUPPET_INSTALL_TYPE'] = 'pe'
213
+ ENV['PUPPET_INSTALL_VERSION'] = '2017.3.5'
214
+ ENV['BEAKER_IS_PE'] = 'yes'
215
+ ENV['BEAKER_PE_VER'] = '2017.3.5'
216
+ ENV['BEAKER_PUPPET_AGENT_VERSION'] = '5.3.5'
217
+ expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => '2017.3.5', 'puppet_agent_version' => '5.3.5')
208
218
  subject.run_puppet_install_helper_on(hosts)
209
219
  end
210
220
  it 'installs certs on PE 3 solaris' do
211
221
  sol = { 'pe_ver' => '3.8.3', 'platform' => 'solaris-11-64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne' }
212
222
  hosts = [sol]
213
223
  ENV['PUPPET_INSTALL_TYPE'] = 'pe'
214
- ENV['PUPPET_INSTALL_VERSION'] = '3.8.1'
215
- expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => '3.8.1')
224
+ ENV['BEAKER_PE_VER'] = '3.8.1'
225
+ expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => '3.8.1', 'puppet_agent_version' => nil)
216
226
  expect(subject).to receive(:create_cert_on_host).exactly(3).times
217
227
  expect(subject).to receive(:add_solaris_cert).exactly(3).times
218
228
  subject.run_puppet_install_helper_on(hosts)
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker-puppet_install_helper
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.0
4
+ version: 0.9.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppetlabs