Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Puppet 6.x support #542

Merged
merged 5 commits into from
Oct 5, 2018
Merged

Add Puppet 6.x support #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e4f1d08
enable unit tests on puppet6
bastelfreak Sep 19, 2018
82b236d
drop legacy puppet3 code from tests
bastelfreak Sep 19, 2018
6e2bab4
allow puppet 6.x
bastelfreak Sep 19, 2018
50a4162
add yumrepo_core module to fixtures
bastelfreak Oct 5, 2018
6556c50
add selboolean_core module to fixtures
bastelfreak Oct 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .fixtures.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,9 @@ fixtures:
pe_gem: "git://github.com/puppetlabs/puppetlabs-pe_gem.git"
systemd: "git://github.com/camptocamp/puppet-systemd.git"
selinux: "git://github.com/voxpupuli/puppet-selinux.git"
symlinks:
zabbix: "#{source_dir}"
yumrepo_core:
repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
puppet_version: ">= 6.0.0"
selinux_core:
repo: https://github.com/puppetlabs/puppetlabs-selinux_core.git
puppet_version: ">= 6.0.0"
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ matrix:
env: PUPPET_VERSION="~> 5.0" CHECK=test
- rvm: 2.5.1
bundler_args: --without system_tests development release
env: PUPPET_VERSION="~> 5.0" CHECK=test_with_coveralls
env: PUPPET_VERSION="~> 6.0" CHECK=test_with_coveralls
- rvm: 2.4.4
bundler_args: --without system_tests development release
env: PUPPET_VERSION="~> 5.0" CHECK=rubocop
env: PUPPET_VERSION="~> 6.0" CHECK=rubocop
- rvm: 2.5.1
bundler_args: --without system_tests development release
env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 4.10.0 < 6.0.0"
"version_requirement": ">= 4.10.0 < 7.0.0"
}
],
"operatingsystem_support": [
Expand Down
6 changes: 1 addition & 5 deletions spec/classes/web_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
require 'spec_helper'

def package_provider_for_gems
Puppet.version =~ %r{^4|^5} ? 'puppet_gem' : 'gem'
end

describe 'zabbix::web' do
let :node do
'rspec.puppet.com'
Expand Down Expand Up @@ -131,7 +127,7 @@ def package_provider_for_gems
end

it { is_expected.to contain_class('zabbix::resources::web') }
it { is_expected.to contain_package('zabbixapi').that_requires('Class[ruby::dev]').with_provider(package_provider_for_gems) }
it { is_expected.to contain_package('zabbixapi').that_requires('Class[ruby::dev]').with_provider('puppet_gem') }
it { is_expected.to contain_class('ruby::dev') }
it { is_expected.to contain_file('/etc/zabbix/imported_templates').with_ensure('directory') }
end
Expand Down