From 2cd5821df2babf49a5949286d8fb6a9f25e7beec Mon Sep 17 00:00:00 2001 From: Daniel Farrell Date: Mon, 27 Aug 2018 16:55:28 -0400 Subject: [PATCH] Upgrade Beaker 3 to 4 Our unpinned Beaker version went from pulling in 3.39.0 to 4.0.0, which broke our tests. Need to do the upgrade procedure as documented here: https://github.com/puppetlabs/beaker/blob/4.0.0/docs/how_to/upgrade_from_3_to_4.md Change-Id: I29479aa650894a4e00fc4ff38ff14fbfda8efa98 Signed-off-by: Daniel Farrell Signed-off-by: Tim Rozet --- Gemfile | 2 ++ spec/spec_helper_acceptance.rb | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 703c6af..500db85 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,8 @@ source "https://rubygems.org" gem "beaker" +gem "beaker-puppet" +gem "beaker-docker" gem "beaker-rspec" gem "guard-rake" gem "metadata-json-lint" diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 517c173..34b526b 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,11 +1,16 @@ require 'beaker-rspec/spec_helper' require 'beaker-rspec/helpers/serverspec' +require 'beaker-puppet' + +include Beaker::DSL::InstallUtils::FOSSUtils +include Beaker::DSL::InstallUtils::ModuleUtils +include Beaker::DSL::Helpers::PuppetHelpers # Install Puppet on all Beaker hosts unless ENV['BEAKER_provision'] == 'no' hosts.each do |host| # Install Puppet - install_puppet_agent_on(host, puppet_collection: "pc1") + install_puppet_agent_on(host, {:puppet_collection => "pc1"}) end end -- 2.36.6