Merge pull request #542 from bastelfreak/puppet6

Add Puppet 6.x support
voxpupuli · Oct 5, 2018 · 8b22568 · 8b22568
2 parents 88943d1 + 6556c50
commit 8b22568
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -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"
diff --git a/.travis.yml b/.travis.yml
@@ -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

diff --git a/metadata.json b/metadata.json
@@ -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": [

diff --git a/spec/classes/web_spec.rb b/spec/classes/web_spec.rb
@@ -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'
@@ -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