Merge pull request #1050 from tylerjl/puppet-6

Puppet 6 Support

Author: tylerjl

.fixtures.yml

@@ -3,6 +3,9 @@ fixtures:
     archive:
       repo: puppet/archive
       ref: 0.5.1
+    augeas_core:
+      repo: puppetlabs/augeas_core
+      ref: 1.0.4
     stdlib:
       repo: puppetlabs/stdlib
       ref: 4.13.1
@@ -19,8 +22,11 @@ fixtures:
       repo: puppetlabs/apt
       ref: 2.2.2
     zypprepo:
-      repo: darin/zypprepo
-      ref: 1.0.2
+      repo: puppet/zypprepo
+      ref: 2.2.2
+    yumrepo_core:
+      repo: puppetlabs/yumrepo_core
+      ref: 1.0.3
     java_ks: puppetlabs/java_ks
     elastic_stack:
       repo: elastic/elastic_stack

.travis.yml

@@ -51,6 +51,9 @@ jobs:
   - env:
     - TASK=intake
     - PUPPET_VERSION='~> 5.0'
+  - env:
+    - TASK=intake
+    - PUPPET_VERSION='~> 6.0'
   - stage: acceptance
     env:
     - TASK=beaker:centos-6-x64:acceptance

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## x.x.x (Month Day, Year)
 
 #### Features
+* Support for Puppet 6
 
 #### Fixes
 

README.md

@@ -56,7 +56,7 @@ When using the repository management, the following module dependencies are requ
 
 * General: [Elastic/elastic_stack](https://forge.puppet.com/elastic/elastic_stack)
 * Debian/Ubuntu: [Puppetlabs/apt](https://forge.puppetlabs.com/puppetlabs/apt)
-* OpenSuSE/SLES: [Darin/zypprepo](https://forge.puppetlabs.com/darin/zypprepo)
+* OpenSuSE/SLES: [puppet/zypprepo](https://forge.puppetlabs.com/puppet/zypprepo)
 
 ### Beginning with Elasticsearch
 

metadata.json

@@ -19,7 +19,7 @@
     },
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.0 < 6.0.0"
+      "version_requirement": ">= 4.13.0 < 7.0.0"
     }
   ],
   "operatingsystem_support": [
@@ -80,7 +80,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.10.0 < 6.0.0"
+      "version_requirement": ">= 4.10.0 < 7.0.0"
     }
   ]
 }

spec/matrix.yml

@@ -11,6 +11,7 @@ OS:
   - ubuntu-server-1604-x64
 PUPPET_VERSION:
   - ""
+  - "~> 6.0"
   - "~> 5.0"
   - "~> 4.10.0"
 TEST_TYPE:

spec/spec_helper_acceptance.rb

@@ -231,12 +231,12 @@ class { 'elasticsearch':
     ] + Beaker::DSL::InstallUtils::ModuleUtils::PUPPET_MODULE_INSTALL_IGNORE
 
     hosts.each do |host|
-      modules = %w[archive datacat java java_ks stdlib elastic_stack]
+      modules = %w[archive augeas_core datacat java java_ks stdlib elastic_stack]
 
       dist_module = {
         'Debian' => ['apt'],
         'Suse'   => ['zypprepo'],
-        'RedHat' => ['concat']
+        'RedHat' => %w[concat yumrepo_core]
       }[f['os']['family']]
 
       modules += dist_module unless dist_module.nil?