summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-09-28 11:59:41 +0200
committervarac <varacanero@zeromail.org>2016-09-28 11:59:41 +0200
commit2558e45a5fe0ff6990eb5b722e1ba867014a9788 (patch)
tree2b2264a1eb20a9df1f4f3b02c83a970f5911fcef /.travis.yml
parent4e23209eaccf1ab504d35158f4141b3053327c2f (diff)
parentcd6c3bc87e59bd51191c08515a7807071b3bb7a3 (diff)
Merge remote-tracking branch 'puppetlabs/master'HEADmaster
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml24
1 files changed, 21 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 588fb5b..4e549bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,18 +3,36 @@
sudo: false
language: ruby
cache: bundler
-bundler_args: --without system_tests
script: "bundle exec rake validate lint spec"
matrix:
fast_finish: true
include:
- - rvm: 2.1.6
- env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+ - 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/centos-7
+ 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