Support Puppet 5
This commit is contained in:
parent
82f436c6b8
commit
9c269790a6
@ -8,6 +8,6 @@ fixtures:
|
|||||||
ref: 'v1.4.1'
|
ref: 'v1.4.1'
|
||||||
firewall:
|
firewall:
|
||||||
repo: 'https://github.com/puppetlabs/puppetlabs-firewall.git'
|
repo: 'https://github.com/puppetlabs/puppetlabs-firewall.git'
|
||||||
ref: '0.2.1'
|
ref: '1.9.0'
|
||||||
symlinks:
|
symlinks:
|
||||||
ssh: "#{source_dir}"
|
ssh: "#{source_dir}"
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
---
|
---
|
||||||
language: ruby
|
language: ruby
|
||||||
|
|
||||||
bundler_args: --without system_tests development
|
|
||||||
|
|
||||||
cache: bundler
|
cache: bundler
|
||||||
|
|
||||||
before_install:
|
before_install:
|
||||||
@ -48,6 +46,10 @@ matrix:
|
|||||||
env: PUPPET_GEM_VERSION="~> 4.10.0"
|
env: PUPPET_GEM_VERSION="~> 4.10.0"
|
||||||
- rvm: 2.1.9
|
- rvm: 2.1.9
|
||||||
env: PUPPET_GEM_VERSION="~> 4"
|
env: PUPPET_GEM_VERSION="~> 4"
|
||||||
|
- rvm: 2.4.1
|
||||||
|
env: PUPPET_GEM_VERSION="~> 5.0.0"
|
||||||
|
- rvm: 2.4.1
|
||||||
|
env: PUPPET_GEM_VERSION="~> 5"
|
||||||
|
|
||||||
notifications:
|
notifications:
|
||||||
email: false
|
email: false
|
||||||
|
4
Gemfile
4
Gemfile
@ -32,3 +32,7 @@ gem 'metadata-json-lint' if RUBY_VERSION >= '2.0'
|
|||||||
gem 'puppetlabs_spec_helper', '2.0.2', :require => false if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
|
gem 'puppetlabs_spec_helper', '2.0.2', :require => false if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
|
||||||
gem 'puppetlabs_spec_helper', '>= 2.0.0', :require => false if RUBY_VERSION >= '1.9'
|
gem 'puppetlabs_spec_helper', '>= 2.0.0', :require => false if RUBY_VERSION >= '1.9'
|
||||||
gem 'parallel_tests', '<= 2.9.0', :require => false if RUBY_VERSION < '2.0.0'
|
gem 'parallel_tests', '<= 2.9.0', :require => false if RUBY_VERSION < '2.0.0'
|
||||||
|
|
||||||
|
if puppetversion < '5.0'
|
||||||
|
gem 'semantic_puppet', :require => false
|
||||||
|
end
|
||||||
|
@ -19,9 +19,10 @@ This module may be used with a simple `include ::ssh`
|
|||||||
|
|
||||||
# Compatibility
|
# Compatibility
|
||||||
|
|
||||||
This module has been tested to work on the following systems with Puppet
|
This module has been tested to work on the following systems with the
|
||||||
versions v3, v3 with future parser, and v4 with Ruby versions 1.8.7 (Puppet v3
|
latest Puppet v3, v3 with future parser, last few releases of v4 and
|
||||||
only), 1.9.3, 2.0.0 and 2.1.9. See .travis.yml for the exact matrix.
|
Puppet v5. See .travis.yml for the exact matrix of supported Puppet and
|
||||||
|
ruby versions.
|
||||||
|
|
||||||
* Debian 7
|
* Debian 7
|
||||||
* EL 5
|
* EL 5
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
"requirements": [
|
"requirements": [
|
||||||
{
|
{
|
||||||
"name": "puppet",
|
"name": "puppet",
|
||||||
"version_requirement": ">= 3.0.0 < 5.0.0"
|
"version_requirement": ">= 3.0.0 < 6.0.0"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"operatingsystem_support": [
|
"operatingsystem_support": [
|
||||||
@ -89,6 +89,6 @@
|
|||||||
"dependencies": [
|
"dependencies": [
|
||||||
{"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"},
|
{"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"},
|
||||||
{"name":"ghoneycutt/common","version_requirement":">= 1.4.1 < 2.0.0"},
|
{"name":"ghoneycutt/common","version_requirement":">= 1.4.1 < 2.0.0"},
|
||||||
{"name":"puppetlabs/firewall","version_requirement":">= 0.2.1 < 2.0.0"}
|
{"name":"puppetlabs/firewall","version_requirement":">= 1.9.0 < 2.0.0"}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user