(MODULES-3983) Update parallel_tests for ruby 2.0.0

[puppet-modules/puppetlabs-apt.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index c825f5e4ed3da0d6556bfb48fc993923eab5b7d8..72388c20438f26635d529fc32b3d6e6ed2f09310 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,36 +1,38 @@
+#This file is generated by ModuleSync, do not edit.
+---
+sudo: false
 language: ruby
-bundler_args: --without development
-script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
-rvm:
-  - 1.8.7
-  - 1.9.3
-  - ruby-head
-env:
-<<<<<<< HEAD
-  - PUPPET_VERSION=3.0.1
-  - PUPPET_VERSION=2.7.13
-  - PUPPET_VERSION=2.7.6
-  - PUPPET_VERSION=2.6.9
-=======
-  - PUPPET_GEM_VERSION="~> 2.6.0"
-  - PUPPET_GEM_VERSION="~> 2.7.0"
-  - PUPPET_GEM_VERSION="~> 3.0.0"
-  - PUPPET_GEM_VERSION="~> 3.1.0"
-  - PUPPET_GEM_VERSION="~> 3.2.0"
+cache: bundler
+script: "bundle exec rake validate lint spec"
 matrix:
-  exclude:
-    - rvm: ruby-head
-      env: PUPPET_GEM_VERSION="~> 3.0.0"
-    - rvm: ruby-head
-      env: PUPPET_GEM_VERSION="~> 3.1.0"
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: ruby-head
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.6.0"
-    - rvm: ruby-head
-      env: PUPPET_GEM_VERSION="~> 2.6.0"
->>>>>>> 18ee4cc6c9eb8d16becfec68254d8955eb10c7d5
+  fast_finish: true
+  include:
+  - rvm: 2.3.1
+    dist: trusty
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
+    script: bundle exec rake beaker
+    services: docker
+    sudo: required
+  - rvm: 2.3.1
+    dist: trusty
+    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/debian-8
+    script: bundle exec rake beaker
+    services: docker
+    sudo: required
+  - rvm: 2.3.1
+    bundler_args: --without system_tests
+    env: PUPPET_GEM_VERSION="~> 4.0"
+  - rvm: 2.1.9
+    bundler_args: --without system_tests
+    env: PUPPET_GEM_VERSION="~> 4.0"
+  - rvm: 2.1.5
+    bundler_args: --without system_tests
+    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+  - rvm: 2.1.5
+    bundler_args: --without system_tests
+    env: PUPPET_GEM_VERSION="~> 3.0"
+  - rvm: 1.9.3
+    bundler_args: --without system_tests
+    env: PUPPET_GEM_VERSION="~> 3.0"
 notifications:
   email: false