Merge pull request #39 from da-ar/f5-update

Fix build issues on Jenkins
puppetlabs · Jan 21, 2019 · fc4319f · fc4319f
2 parents 92679aa + 193ab96
commit fc4319f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -31,7 +31,7 @@ end
 group :system_tests do
   gem "puppet-module-posix-system-r#{minor_version}",                            require: false, platforms: [:ruby]
   gem "puppet-module-win-system-r#{minor_version}",                              require: false, platforms: [:mswin, :mingw, :x64_mingw]
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 3.13')
+  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.4')
   gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
   gem "beaker-pe",                                                               require: false
   gem "beaker-hostgenerator"

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -1,3 +1,5 @@
+require 'beaker-pe'
+require 'beaker-puppet'
 require 'beaker-rspec/spec_helper'
 require 'beaker-rspec/helpers/serverspec'
 require 'beaker-task_helper'
@@ -7,6 +9,7 @@
 
 if ENV['BEAKER_provision'] != 'no'
   run_puppet_install_helper
+  configure_type_defaults_on(hosts)
   install_module_on(hosts)
   install_module_dependencies_on(hosts)
 end
@@ -17,7 +20,7 @@
     unless ENV['BEAKER_TESTMODE'] == 'local'
       unless ENV['BEAKER_provision'] == 'no'
         install_module_from_forge('puppetlabs-cisco_ios', '0.2.0')
-        install_module_from_forge('f5-f5', '1.8.0')
+        install_module_from_forge('f5-f5', '1.9.0')
       end
       hosts.each do |host|
       end