From 9a7854bfe0379e8a9cd1194e0ae811a85f2009a1 Mon Sep 17 00:00:00 2001
From: Trey Dockendorf <tdockendorf@osc.edu>
Date: Tue, 14 May 2019 11:24:38 -0400
Subject: [PATCH] Support Puppet 5 and 6 and update module dependency versions

---
 .fixtures.yml |  3 +++
 .travis.yml   | 24 ++++++++++++++++++------
 metadata.json |  6 +++---
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 2d340cc..5f349c6 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -4,5 +4,8 @@ fixtures:
     epel: https://github.com/stahnma/puppet-module-epel.git
     inifile: https://github.com/puppetlabs/puppetlabs-inifile.git
     firewall: https://github.com/puppetlabs/puppetlabs-firewall.git
+    yumrepo_core:
+      repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
+      puppet_version: ">= 6.0.0"
   symlinks:
     globus: "#{source_dir}"
diff --git a/.travis.yml b/.travis.yml
index 804a017..d1f1b1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,21 +7,33 @@ script: bundle exec rake release_checks
 matrix:
   fast_finish: true
   include:
-    - rvm: 2.1.8
-      env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
     - rvm: 2.4.4
       env: PUPPET_GEM_VERSION="~> 5.0" STRICT_VARIABLES="yes"
+    - rvm: 2.5.1
+      env: PUPPET_GEM_VERSION="~> 6.0" STRICT_VARIABLES="yes"
     - rvm: 2.4.4
       sudo: required
       services: docker
-      env: BEAKER_set="centos-6-x64-docker"
+      env: BEAKER_set="centos-6-x64-docker" BEAKER_PUPPET_COLLECTION=puppet5
       bundler_args:
-      script: sudo service docker restart ; sleep 10 ; bundle exec rake beaker
+      script: bundle exec rake beaker
     - rvm: 2.4.4
       sudo: required
       services: docker
-      env: BEAKER_set="centos-7-x64-docker"
+      env: BEAKER_set="centos-6-x64-docker" BEAKER_PUPPET_COLLECTION=puppet6
       bundler_args:
-      script: sudo service docker restart ; sleep 10 ; bundle exec rake beaker
+      script: bundle exec rake beaker
+    - rvm: 2.4.4
+      sudo: required
+      services: docker
+      env: BEAKER_set="centos-7-x64-docker" BEAKER_PUPPET_COLLECTION=puppet5
+      bundler_args:
+      script: bundle exec rake beaker
+    - rvm: 2.4.4
+      sudo: required
+      services: docker
+      env: BEAKER_set="centos-7-x64-docker" BEAKER_PUPPET_COLLECTION=puppet6
+      bundler_args:
+      script: bundle exec rake beaker
 notifications:
   email: false
diff --git a/metadata.json b/metadata.json
index bdd0b28..f3c9942 100644
--- a/metadata.json
+++ b/metadata.json
@@ -24,12 +24,12 @@
     }
   ],
   "dependencies": [
-    { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.13.1 <5.0.0" },
-    { "name": "puppetlabs/inifile", "version_requirement": ">= 1.0.0 <2.0.0" },
+    { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.13.1 <6.0.0" },
+    { "name": "puppetlabs/inifile", "version_requirement": ">= 1.0.0 <4.0.0" },
     { "name": "puppetlabs/firewall", "version_requirement": ">= 1.0.0 <2.0.0" },
     { "name": "stahnma/epel", "version_requirement": ">= 1.0.0 <2.0.0" }
   ],
   "requirements": [
-    {"name": "puppet", "version_requirement": ">= 4.7.0 < 6.0.0" }
+    {"name": "puppet", "version_requirement": ">= 5.0.0 < 7.0.0" }
   ]
 }