summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColleen Murphy <colleen@puppetlabs.com>2015-03-23 12:30:36 -0700
committerColleen Murphy <colleen@puppetlabs.com>2015-03-23 23:42:53 -0700
commit7dc0025a0c8f3ddea12bf642a69a62e22daef071 (patch)
tree6f5718cc2aef461d464155e5b6e0decc797ccafc
parent6ec1fc6a118579c4983aecf5275dbfdd00f59392 (diff)
downloadpuppet-vcsrepo-7dc0025a0c8f3ddea12bf642a69a62e22daef071.tar.gz
puppet-vcsrepo-7dc0025a0c8f3ddea12bf642a69a62e22daef071.tar.bz2
Update .travis.yml
This commit makes the following changes to the test matrix: - Runs tests on ruby 2.1.5 instead of 2.0.0 - Runs tests on ruby 1.8.7 with puppet 3.x - Adds an environment to run on an intermediate 3.x puppet version instead of latest (specifically 3.4.x) - Adds an environment to run with the future parser on latest puppet. This would affect the test runs for the validate and spec checks. - Runs the tests on docker
-rw-r--r--.travis.yml19
1 files changed, 15 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 8cfaf23..0fc75e3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,28 @@
---
+sudo: false
language: ruby
bundler_args: --without system_tests
script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
matrix:
fast_finish: true
include:
+ - rvm: 1.9.3
+ env: PUPPET_GEM_VERSION="~> 3.4.0"
- 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"
+ env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0"
- - rvm: 2.0.0
+ - rvm: 1.9.3
+ env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+ - rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0"
+ - rvm: 2.1.5
+ env: PUPPET_GEM_VERSION="~> 3.4.0"
+ - rvm: 2.1.5
+ env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+ - 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"
notifications:
email: false