sync via modulesync
This commit is contained in:
parent
e4b4afd000
commit
11f3b2dd86
2 changed files with 1 additions and 26 deletions
|
@ -6,18 +6,12 @@ script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake
|
||||||
matrix:
|
matrix:
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
include:
|
include:
|
||||||
- rvm: 1.9.3
|
|
||||||
env: PUPPET_GEM_VERSION="~> 3.4.0"
|
|
||||||
- rvm: 1.8.7
|
- rvm: 1.8.7
|
||||||
env: PUPPET_GEM_VERSION="~> 3.0"
|
env: PUPPET_GEM_VERSION="~> 3.0"
|
||||||
- rvm: 1.9.3
|
- rvm: 1.9.3
|
||||||
env: PUPPET_GEM_VERSION="~> 3.0"
|
env: PUPPET_GEM_VERSION="~> 3.0"
|
||||||
- rvm: 1.9.3
|
|
||||||
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
|
|
||||||
- rvm: 2.1.5
|
- rvm: 2.1.5
|
||||||
env: PUPPET_GEM_VERSION="~> 3.0"
|
env: PUPPET_GEM_VERSION="~> 3.0"
|
||||||
- rvm: 2.1.5
|
|
||||||
env: PUPPET_GEM_VERSION="~> 3.4.0"
|
|
||||||
- rvm: 2.1.5
|
- rvm: 2.1.5
|
||||||
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
|
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
|
||||||
- rvm: 1.8.7
|
- rvm: 1.8.7
|
||||||
|
|
19
Gemfile
19
Gemfile
|
@ -1,15 +1,5 @@
|
||||||
source ENV['GEM_SOURCE'] || "https://rubygems.org"
|
source ENV['GEM_SOURCE'] || "https://rubygems.org"
|
||||||
|
|
||||||
def location_for(place, fake_version = nil)
|
|
||||||
if place =~ /^(git:[^#]*)#(.*)/
|
|
||||||
[fake_version, { :git => $1, :branch => $2, :require => false }].compact
|
|
||||||
elsif place =~ /^file:\/\/(.*)/
|
|
||||||
['>= 0', { :path => File.expand_path($1), :require => false }]
|
|
||||||
else
|
|
||||||
[place, { :require => false }]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
group :development, :unit_tests do
|
group :development, :unit_tests do
|
||||||
gem 'rspec-core', '3.1.7', :require => false
|
gem 'rspec-core', '3.1.7', :require => false
|
||||||
gem 'puppetlabs_spec_helper', :require => false
|
gem 'puppetlabs_spec_helper', :require => false
|
||||||
|
@ -18,17 +8,8 @@ group :development, :unit_tests do
|
||||||
gem 'json', :require => false
|
gem 'json', :require => false
|
||||||
end
|
end
|
||||||
|
|
||||||
beaker_version = ENV['BEAKER_VERSION']
|
|
||||||
beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
|
|
||||||
group :system_tests do
|
group :system_tests do
|
||||||
if beaker_version
|
|
||||||
gem 'beaker', *location_for(beaker_version)
|
|
||||||
end
|
|
||||||
if beaker_rspec_version
|
|
||||||
gem 'beaker-rspec', *location_for(beaker_rspec_version)
|
|
||||||
else
|
|
||||||
gem 'beaker-rspec', :require => false
|
gem 'beaker-rspec', :require => false
|
||||||
end
|
|
||||||
gem 'serverspec', :require => false
|
gem 'serverspec', :require => false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue