(MODULES-11371) Add Vox Beaker gem

In 057188e, we updated the module according to PDK template 7.2.1,
which updated puppetlabs_spec_helper. The updated version of
puppetlabs_spec_helper removed the Beaker rake task, which we use
for acceptance testing.

This commit adds the voxpupuli-acceptance gem, which re-adds the
Beaker rake task.

diff --git a/Gemfile b/Gemfile
index 4c131b47ef0495bb68822012025e9d267d2765c9..b1261c6f1816a5f6548634850a97b811b01c2a82 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -49,6 +49,7 @@ end
 group :system_tests do
   gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby]
   gem "serverspec", '~> 2.41',    require: false
+  gem "voxpupuli-acceptance"
 end
 
 puppet_version = ENV['PUPPET_GEM_VERSION']

diff --git a/Rakefile b/Rakefile
index 0f8754eb61e400db1d117cad5026f06d3ba6ff89..10ddd141125b662d9feea9794acfa6b7f407f99d 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -7,6 +7,7 @@ require 'puppet-syntax/tasks/puppet-syntax'
 require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
 require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
 require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?
+require 'voxpupuli/acceptance/rake'
 
 def changelog_user
   return unless Rake.application.top_level_tasks.include? "changelog"

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
index cb4ccb25da62b0b6e337038bcbe9f8c90c16820f..c9d0c8cf617e4c4b06b89f2a5109f8ee258bcaf6 100644 (file)
--- a/spec/spec_helper_acceptance.rb
+++ b/spec/spec_helper_acceptance.rb
@@ -1,6 +1,7 @@
 require 'beaker-rspec'
 require 'beaker/module_install_helper'
 require 'beaker/puppet_install_helper'
+require 'voxpupuli/acceptance/spec_helper_acceptance'
 
 def beaker_opts
   { debug: true, trace: true, expect_failures: true, acceptable_exit_codes: (0...256) }