From ba62b9ac69fac1b9386cf2f1901119f5ce5a9fba Mon Sep 17 00:00:00 2001 From: Eimhin Laverty Date: Wed, 19 Sep 2018 13:40:48 +0100 Subject: [PATCH] (FM-7389) - Add Puppet 6 changes --- README.md | 2 +- lib/beaker/puppet_install_helper.rb | 3 ++- spec/unit/beaker/puppet_install_helper_spec.rb | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f72b6a5..07c89af 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This gem is simply an abstraction for the various ways that we install puppet fr The way to use this is to declare either `run_puppet_install_helper()` or `run_puppet_install_helper_on(hosts)` and set environment variables `BEAKER_PUPPET_AGENT_VERSION` and/or `BEAKER_PUPPET_COLLECTION` in the following combinations to have puppet installed on the desired hosts. The nodeset should be configured with `type: pe` or `type: aio` to control the type of install. -- `BEAKER_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_COLLECTION=` will install the specified `BEAKER_PUPPET_AGENT_VERSION` from the specified collection. Valid values are `pc1`, `puppet5`, `puppet6`, `puppet6-nightly` etc. This may change with time. - `BEAKER_PUPPET_AGENT_VERSION=` to specify - `BEAKER_IS_PE=` may be used to force a nodeset to be PE or not, regardless of the nodeset `type` or absence thereof. - `BEAKER_PE_VER=` may be used to specify the PE version for masters. Eg: `BEAKER_PE_VER=2017.3.5` diff --git a/lib/beaker/puppet_install_helper.rb b/lib/beaker/puppet_install_helper.rb index c5b546b..0ee9623 100644 --- a/lib/beaker/puppet_install_helper.rb +++ b/lib/beaker/puppet_install_helper.rb @@ -20,7 +20,8 @@ def run_puppet_install_helper_on(hosts, type_arg = find_install_type, version = # BEAKER_PUPPET_COLLECTION=pc1 <-- for latest 4.x # BEAKER_PUPPET_COLLECTION=puppet5 <-- for latest 5.x # BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_PUPPET_AGENT_VERSION=5.3.1 <-- for specific version - # BEAKER_PUPPET_COLLECTION=puppet6-nightly <-- for latest nightly build + # BEAKER_PUPPET_COLLECTION=puppet6 <-- for latest 6.x + # BEAKER_PUPPET_COLLECTION=puppet-nightly <-- for latest nightly build # BEAKER_PUPPET_AGENT_SHA=0ed2bbc918326263da9d97d0361a9e9303b52938 <-- for specific dev build # Ensure windows 2003 is always set to 32 bit diff --git a/spec/unit/beaker/puppet_install_helper_spec.rb b/spec/unit/beaker/puppet_install_helper_spec.rb index ba5c187..47e7dd5 100644 --- a/spec/unit/beaker/puppet_install_helper_spec.rb +++ b/spec/unit/beaker/puppet_install_helper_spec.rb @@ -161,7 +161,7 @@ subject.run_puppet_install_helper_on(hosts) end end - ['puppet5', 'puppet6-nightly'].each do |collection| + ['puppet5', 'puppet6-nightly', 'puppet6'].each do |collection| context "with #{collection} collection" do it "installs puppet-agent from #{collection} repo" do ENV['BEAKER_PUPPET_COLLECTION'] = collection