Use Travis container infrastructure

diff --git a/.travis.yml b/.travis.yml
index 0e37fa955ad0ed52a7744e98a43cc3165992116b..033f97466609ff1240abf96f286a8e9f14c2b7b7 100644 (file)
--- 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 f9c2b63940bc5d98500983b694c662e5e6165f98..b83f8b695021c24450056a4400178d21724029b7 100644 (file)
--- 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