X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=.travis.yml;h=66e90e38df88ce1b76267e2716398459b39b88ee;hb=5d96da0c6aac8f0f9192fe6ce63548bdaee149b5;hp=03b1729d7100672535c46ae28a77e87b05d6ad75;hpb=2e0dee178d0a32e20f11f11bd23d9d4792b94d99;p=puppet-modules%2Fpuppetlabs-apt.git

diff --git a/.travis.yml b/.travis.yml
index 03b1729..66e90e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,15 @@
+---
 language: ruby
-rvm:
-  - 1.8.7
-  - 1.9.3
-before_script:
-after_script:
-script: "rake spec"
-branches:
-  only:
-    - master
-env:
-  - PUPPET_VERSION=3.0.2
-  - PUPPET_VERSION=2.7.20
-  - PUPPET_VERSION=2.7.6
-  - PUPPET_VERSION=2.6.9
+bundler_args: --without development
+script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
- exclude:
+  fast_finish: true
+  include:
+  - rvm: 1.8.7
+    env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
-    gemfile: .gemfile
-    env: PUPPET_VERSION=2.6.9
-  - rvm: 1.9.3
-    gemfile: .gemfile
-    env: PUPPET_VERSION=2.7.6
-  - rvm: 1.9.3
-    gemfile: .gemfile
-    env: PUPPET_VERSION=2.7.20
+    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 2.0.0
+    env: PUPPET_GEM_VERSION="~> 3.0"
 notifications:
   email: false
-gemfile: .gemfile