aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphaël Pinson <raphael.pinson@camptocamp.com>2014-12-18 09:41:36 +0100
committerRaphaël Pinson <raphael.pinson@camptocamp.com>2014-12-18 09:41:36 +0100
commit12df5ad2ab46f424d490b5f8a405e9ab73d545ba (patch)
tree944d7872a4dfaa5882778f629cfebf5b0914b7c2
parentcd374e68cb49cfb981c45145d3e184017395d8c4 (diff)
downloadpuppet-dhcp-12df5ad2ab46f424d490b5f8a405e9ab73d545ba.tar.gz
puppet-dhcp-12df5ad2ab46f424d490b5f8a405e9ab73d545ba.tar.bz2
Use Travis container infrastructure
-rw-r--r--.travis.yml2
-rw-r--r--Gemfile2
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 0e37fa9..033f974 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,7 @@
---
language: ruby
+sudo: false
+cache: bundler
bundler_args: --without system_tests
script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec fakeroot rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"]
matrix:
diff --git a/Gemfile b/Gemfile
index f9c2b63..b83f8b6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ group :development, :unit_tests do
gem 'rake', :require => false
gem 'rspec-puppet', :require => false, :git => 'https://github.com/rodjek/rspec-puppet.git'
gem 'puppetlabs_spec_helper', :require => false
- gem 'puppet-lint', :require => false
+ gem 'puppet-lint', '< 1.1.0', :require => false
gem 'simplecov', :require => false
gem 'rspec-puppet-facts', :require => false
gem 'json', :require => false