From 9ca65e9f230c75b155f8c435a092cb534538ed1b Mon Sep 17 00:00:00 2001 From: Stephen Benjamin Date: Tue, 21 Jun 2016 08:16:12 -0400 Subject: [PATCH] refs #15217 - puppet 4 support --- .travis.yml | 21 ++++++++++++++++++++- metadata.json | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3ed90189..46424bf4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,30 @@ # This file is managed centrally by modulesync # https://github.com/katello/foreman-installer-modulesync rvm: - - 1.8.7 - 1.9.3 - 2.0.0 - 2.1.5 env: - PUPPET_VERSION=3.5 + - PUPPET_VERSION=3.5 FUTURE_PARSER=yes + - PUPPET_VERSION=4.0 +matrix: + fast_finish: true + exclude: + # No support for Ruby 1.9.3 on Puppet 4.x + - rvm: 1.9.3 + env: PUPPET_VERSION=4.0 + include: + # Only platforms left to support ruby 1.8.7 + - rvm: 1.8.7 + env: PUPPET_VERSION=3.5 + - rvm: 1.8.7 + env: PUPPET_VERSION=3.5 FUTURE_PARSER=yes + # Only Puppet 4.x supports Ruby 2.2. Also limit the OS set we test Ruby 2.2 with. + - rvm: 2.2.3 + env: PUPPET_VERSION=4.0 + # Only Puppet >= 4.4 supports Ruby 2.3. Also limit the OS set we test Ruby 2.3 with. + - rvm: 2.3.0 + env: PUPPET_VERSION=4.4 bundler_args: --without development sudo: false diff --git a/metadata.json b/metadata.json index 723a9816..653edcdf 100644 --- a/metadata.json +++ b/metadata.json @@ -36,7 +36,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 3.2.0 < 4.0.0" + "version_requirement": ">= 3.2.0 < 5.0.0" } ], "operatingsystem_support": [