Merge pull request #426 from anodelman/master

(BKR-147) add Gemfile setting for BEAKER_VERSION for puppet...
This commit is contained in:
Justin Stoller 2015-03-26 16:59:50 -07:00
commit 2762bb6c93

11
Gemfile
View file

@ -21,12 +21,17 @@ group :development, :unit_tests do
end
beaker_version = ENV['BEAKER_VERSION']
beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
group :system_tests do
if beaker_version
gem 'beaker', *location_for(beaker_version)
gem 'beaker', *location_for(beaker_version)
end
gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false
if beaker_rspec_version
gem 'beaker-rspec', *location_for(beaker_rspec_version)
else
gem 'beaker-rspec', :require => false
end
gem 'serverspec', :require => false
end
facterversion = ENV['GEM_FACTER_VERSION'] || ENV['FACTER_GEM_VERSION']