diff --git a/.gitignore b/.gitignore index 146bf0bf6..7298636e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -pkg spec/fixtures +pkg .bundle/ .vagrant .yardoc @@ -7,3 +7,4 @@ doc *.swp .ruby-version log +Gemfile.lock diff --git a/Gemfile b/Gemfile index fb064a8ac..e2aabd9b4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -source "http://rubygems.org" +source "https://rubygems.org" group :test do gem "rake" @@ -15,11 +15,12 @@ end group :development do gem "travis" gem "travis-lint" - gem "beaker", :git => 'https://github.com/puppetlabs/beaker.git' + gem "beaker", "2.13.0" gem "beaker-puppet_install_helper", :require => false gem "beaker-rspec" gem "puppet-blacksmith" gem "guard-rake" gem "pry" gem "yard" + #gem "vagrant-wrapper" end diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index a83e96be6..13e560126 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,7 +1,14 @@ require 'beaker-rspec/spec_helper' require 'beaker-rspec/helpers/serverspec' -require 'beaker/puppet_install_helper' require 'pry' +require 'beaker/puppet_install_helper' + +# this is a workaround for BKR-419. Beaker currently fails to +# install puppet on Ubuntu 14.04 after version 2.13.0. But +# install_puppet_on is used by puppet_install_helper +def install_puppet_on(hosts, opts = {}) + install_puppet(opts) +end unless respond_to? :install_puppet_on run_puppet_install_helper