summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Stoller <justin.stoller@gmail.com>2015-03-26 16:59:50 -0700
committerJustin Stoller <justin.stoller@gmail.com>2015-03-26 16:59:50 -0700
commit2762bb6c930a3547aaef339fd8f649af349385c2 (patch)
tree99805ebedb7ee1d31409553a93f0c2f7be20f85d
parent4dab70b305c4ab1c8c36356efa4bd205678c7c49 (diff)
parent2381f7cff480019013da87baf962ce6e665779f4 (diff)
Merge pull request #426 from anodelman/master
(BKR-147) add Gemfile setting for BEAKER_VERSION for puppet...
-rw-r--r--Gemfile11
1 files changed, 8 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index e1a59fa..2d19594 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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']