From 541a5f0ab1a4c38e387d9dbdb680b6c0eae87bce Mon Sep 17 00:00:00 2001
From: Steve Traylen <steve.traylen@cern.ch>
Date: Mon, 22 Mar 2021 09:28:55 +0100
Subject: [PATCH] Drop Puppet 5 and CentOS 6 Support

* Drop Puppet 5 support
* Drop CentOS 6 support
* Add Puppet 7 support
* Increase upper bound of puppetlabs-stdlib
---
 .fixtures.yml             | 8 ++------
 manifests/init.pp         | 1 -
 metadata.json             | 6 ++----
 spec/classes/init_spec.rb | 6 +++---
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index 16aab36..0b8b64b 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -2,9 +2,5 @@
 fixtures:
   repositories:
     stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
-    yumrepo_core:
-      repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
-      puppet_version: ">= 6.0.0"
-    augeas_core:
-      repo: https://github.com/puppetlabs/puppetlabs-augeas_core.git
-      puppet_version: ">= 6.0.0"
+    yumrepo_core: 'https://github.com/puppetlabs/puppetlabs-yumrepo_core.git'
+    augeas_core: 'https://github.com/puppetlabs/puppetlabs-augeas_core.git'
diff --git a/manifests/init.pp b/manifests/init.pp
index ff68e11..34af90f 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -91,7 +91,6 @@
 ) {
   # Is the package cron or systemd.timer based?
   $periodic_method = $facts['os']['release']['major'] ? {
-    '6' => 'cron',
     '7' => 'cron',
     default => 'timer',
   }
diff --git a/metadata.json b/metadata.json
index 962c9af..2cae4e4 100644
--- a/metadata.json
+++ b/metadata.json
@@ -16,20 +16,19 @@
   "dependencies": [
     {
       "name": "puppetlabs-stdlib",
-      "version_requirement": ">= 4.13.1 < 7.0.0"
+      "version_requirement": ">= 4.13.1 < 8.0.0"
     }
   ],
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 5.5.8 < 7.0.0"
+      "version_requirement": ">= 6.1.0 < 7.0.0"
     }
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "6",
         "7",
         "8"
       ]
@@ -37,7 +36,6 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "6",
         "7",
         "8"
       ]
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
index 894228c..f49a9d7 100644
--- a/spec/classes/init_spec.rb
+++ b/spec/classes/init_spec.rb
@@ -15,7 +15,7 @@
         it { is_expected.to contain_file('/etc/fetch-crl.conf').without_content(%r{cache_control_request}) }
         it { is_expected.to contain_file('/etc/fetch-crl.conf').without_content(%r{noerrors}) }
         case facts[:os]['release']['major']
-        when '6', '7'
+        when '7'
           it { is_expected.to contain_augeas('randomise_cron').with_incl('/etc/cron.d/fetch-crl') }
           it { is_expected.to contain_augeas('randomise_cron').with_changes([%r{set minute ([0-9]|[1-5][0-9])}, %r{set hour [0-5]-23/6}]) }
           it { is_expected.to contain_service('fetch-crl-boot').with_ensure(false) }
@@ -54,7 +54,7 @@
 
         it { is_expected.to contain_file('/etc/fetch-crl.conf').with_content(%r{^noerrors$}) }
         case facts[:os]['release']['major']
-        when '6', '7'
+        when '7'
           it { is_expected.to contain_augeas('randomise_cron').with_incl('/etc/cron.d/fetch-crl') }
           it { is_expected.to contain_augeas('randomise_cron').with_changes([%r{set minute ([0-9]|[1-5][0-9])}, %r{set hour [0-5]-23/6}]) }
           it { is_expected.to contain_service('fetch-crl-boot').with_ensure(true) }
@@ -81,7 +81,7 @@
         it { is_expected.to contain_file('/etc/fetch-crl.conf').without_content(%r{^noerrors$}) }
         it { is_expected.not_to contain_augeas('randomise_cron') }
         case facts[:os]['release']['major']
-        when '6', '7'
+        when '7'
           it { is_expected.not_to contain_service('fetch-crl.timer') }
         else
           it { is_expected.to contain_service('fetch-crl.timer').with_ensure(false) }