beaker-puppet_install_helper 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4671087136928e9adda784a24f1ea5577e5b6b68
-  data.tar.gz: 5f785c6f41fd90a0a7b0c578b321910c5fec3c77
+  metadata.gz: ec9fa976af3946c77519c2a70ce1432db3b0c69b
+  data.tar.gz: 595ab848ddc5c34ebfdc8a7ebfe44aa62630b033
 SHA512:
-  metadata.gz: cc2780d965a5f86cf072b373bf3b9da60cae36dd123a84b3b06fed1b9cd60e607fa10d81fa1387a041988409e2b69e6ada775ec984ad81ce1da74df8e7789f73
-  data.tar.gz: f898be72b22bfbaa300370cd3df8f7eaeb4d60377a45404a938bfb97c55f69cbfcb4f8474e777349f9070fb95e5d4c28d44ad96b9e06dd8d85712a68ed6857c3
+  metadata.gz: ff0b6ed2432832542325c4ee19c0de9dbc15e245ec322afcde3e0f652a62e4b9a814e74b96e1b2a98a41c9124ee7e269f073eb643005dbae7716215ee77023dd
+  data.tar.gz: 4c28e0ffc4ed913c231d77482b8df9393843e6d6eff4ecc998a428aac911411543a0bc6dcad854c2ea5cedcb6585561d2f1e23a0952e32843586ca3bb69f903c

data/CHANGELOG.md

@@ -4,6 +4,11 @@ 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.1]
+### Fixed
+- Pass `BEAKER_PE_VER` to `install_pe_on()` for the PE version rather than `BEAKER_PUPPET_AGENT_VERSION` or `PUPPET_INSTALL_VERSION`
+- Pass `BEAKER_PUPPET_AGENT_VERSION` to `install_pe_on()` as the agent version to be installed alongside PE.
+
 ## [0.9.0]
 ### Changed
 - 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/).
 ### Fixed
 - 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]
 
-## [0.8.0]
+## [0.8.0] - Yanked
 ### Changed
 - Changed the default `PUPPET_INSTALL_TYPE` from "agent" (puppet 4) to "puppet5"
 
@@ -60,6 +65,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Add solaris for installing CA certs as well.
 
+[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
 [0.8.0]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.7.1...0.8.0
 [0.7.1]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.7.0...0.7.1
 [0.7.0]: https://github.com/puppetlabs/beaker-puppet_install_helper/compare/0.6.0...0.7.0

data/README.md

@@ -9,6 +9,7 @@ The way to use this is to declare either `run_puppet_install_helper()` or `run_p
 - `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.
 - `BEAKER_PUPPET_AGENT_VERSION=<version>` to specify
 - `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.
+- `BEAKER_PE_VER=<pe version>` may be used to specify the PE version for masters. Eg: `BEAKER_PE_VER=2017.3.5`
 - `BEAKER_PUPPET_AGENT_SHA=<sha>` may be used in order to use a development puppet-agent package.
 - `PUPPET_INSTALL_TYPE=foss` may be used to install foss puppet 3.x, but is deprecated and should not be used.
 

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.0'
+  s.version     = '0.9.1'
   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

@@ -31,7 +31,8 @@ module Beaker::PuppetInstallHelper
     case type
     when 'pe'
       # These will skip hosts that are not supported
-      install_pe_on(Array(hosts), options.merge('pe_ver' => version))
+      install_pe_on(Array(hosts), options.merge('pe_ver' => ENV['BEAKER_PE_VER'],
+                                                'puppet_agent_version' => version))
       install_ca_certs_on(Array(hosts))
     when 'foss'
       opts = options.merge(version: version,

data/spec/unit/beaker/puppet_install_helper_spec.rb

@@ -36,6 +36,7 @@ describe 'Beaker::PuppetInstallHelper' do
     ENV.delete('BEAKER_PUPPET_COLLECTION')
     ENV.delete('BEAKER_PUPPET_AGENT_VERSION')
     ENV.delete('BEAKER_PUPPET_AGENT_SHA')
+    ENV.delete('BEAKER_PE_VER')
   end
   describe '#run_puppet_install_helper' do
     before :each do
@@ -66,14 +67,14 @@ describe 'Beaker::PuppetInstallHelper' do
         w2k3 = { 'platform' => 'windows-2003r2-64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne' }
         win_hosts = [w2k3]
         expect(subject).to receive(:default).and_return(double(is_pe?: true))
-        expect(subject).to receive(:install_pe_on).with([w2k3.merge('install_32' => true)], 'pe_ver' => nil)
+        expect(subject).to receive(:install_pe_on).with([w2k3.merge('install_32' => true)], 'pe_ver' => nil, 'puppet_agent_version' => nil)
         expect(subject).to receive(:create_cert_on_host).exactly(3).times
         expect(subject).to receive(:add_windows_cert).exactly(3).times
         subject.run_puppet_install_helper_on(win_hosts)
       end
       it 'uses PE by default for PE nodes' do
         expect(subject).to receive(:default).and_return(hosts[1])
-        expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => nil)
+        expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => nil, 'puppet_agent_version' => nil)
         subject.run_puppet_install_helper_on(hosts)
       end
     end
@@ -193,26 +194,35 @@ describe 'Beaker::PuppetInstallHelper' do
     context 'for PE' do
       it 'uses PE when default is a pe host' do
         expect(subject).to receive(:default).and_return(hosts[1])
-        expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => nil)
+        expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => nil, 'puppet_agent_version' => nil)
         subject.run_puppet_install_helper_on(hosts)
       end
       it 'uses PE explicitly' do
         ENV['PUPPET_INSTALL_TYPE'] = 'pe'
-        expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => nil)
+        expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => nil, 'puppet_agent_version' => nil)
         subject.run_puppet_install_helper_on(hosts)
       end
       it 'uses PE with a version' do
         ENV['PUPPET_INSTALL_TYPE'] = 'pe'
-        ENV['PUPPET_INSTALL_VERSION'] = '3.8.1'
-        expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => '3.8.1')
+        ENV['BEAKER_PE_VER'] = '3.8.1'
+        expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => '3.8.1', 'puppet_agent_version' => nil)
+        subject.run_puppet_install_helper_on(hosts)
+      end
+      it 'uses PE with an agent version' do
+        ENV['PUPPET_INSTALL_TYPE'] = 'pe'
+        ENV['PUPPET_INSTALL_VERSION'] = '2017.3.5'
+        ENV['BEAKER_IS_PE'] = 'yes'
+        ENV['BEAKER_PE_VER'] = '2017.3.5'
+        ENV['BEAKER_PUPPET_AGENT_VERSION'] = '5.3.5'
+        expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => '2017.3.5', 'puppet_agent_version' => '5.3.5')
         subject.run_puppet_install_helper_on(hosts)
       end
       it 'installs certs on PE 3 solaris' do
         sol = { 'pe_ver' => '3.8.3', 'platform' => 'solaris-11-64', 'distmoduledir' => '/dne', 'hieraconf' => '/dne' }
         hosts = [sol]
         ENV['PUPPET_INSTALL_TYPE'] = 'pe'
-        ENV['PUPPET_INSTALL_VERSION'] = '3.8.1'
-        expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => '3.8.1')
+        ENV['BEAKER_PE_VER'] = '3.8.1'
+        expect(subject).to receive(:install_pe_on).with(hosts, 'pe_ver' => '3.8.1', 'puppet_agent_version' => nil)
         expect(subject).to receive(:create_cert_on_host).exactly(3).times
         expect(subject).to receive(:add_solaris_cert).exactly(3).times
         subject.run_puppet_install_helper_on(hosts)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-puppet_install_helper
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Puppetlabs