Merge branch 'master' into leap

1 files changed, 13 insertions, 20 deletions

diff --git a/.travis.yml b/.travis.yml
index 1bb1889..503e184 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,18 @@
+---
+sudo: false
 language: ruby
-bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--color --format documentation'"
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - 2.0.0
-  - ruby-head
-env:
-  - PUPPET_GEM_VERSION=">= 3.0.0"
+bundler_args: --without system_tests
+script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--color --format documentation'"
 matrix:
-  allow_failures:
-    - rvm: 2.0.0
-    - rvm: ruby-head
+  fast_finish: true
   include:
-    - rvm: 1.8.7
-      env: PUPPET_GEM_VERSION="~> 2.7"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
+  - rvm: 1.9.3
+    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 3.0"
 notifications:
   email: false
-  webhooks:
-    urls:
-      - https://puppet-dev-community.herokuapp.com/event/travis-ci/
-    on_success: always
-    on_failure: always
-    on_start: yes