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 <dfarrell@redhat.com>
Signed-off-by: Tim Rozet <trozet@redhat.com>

diff --git a/Gemfile b/Gemfile
index 703c6afa7a287a4bf5ad6726c14dfefcc252a81f..500db85dd294b7d1b16aa87f74d1dfc0e83fdef9 100644 (file)
--- 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 517c1739da44704778c2b5ecce9d5a4f4af4dece..34b526b0651f663f310066f1dacfd62982a2beab 100644 (file)
--- 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