(SIMP-7189) Add EL8 support (#30)

Also removed the version pinning since it is no longer required.

SIMP-7189 #close
SIMP-7202 #comment updated simp-incron

.gitlab-ci.yml

@@ -5,7 +5,7 @@
 # https://puppet.com/docs/pe/2018.1/overview/getting_support_for_pe.html
 # ------------------------------------------------------------------------------
 # Release       Puppet   Ruby   EOL
-# SIMP 6.3      5.5.10   2.4.5  TBD***
+# SIMP 6.3      5.5.16   2.4.5  TBD***
 # PE 2018.1     5.5.8    2.4.5  2020-05 (LTS)***
 # PE 2019.0     6.0      2.5.1  2019-08-31^^^
 #
@@ -69,10 +69,10 @@ variables:
     BEAKER_PUPPET_COLLECTION: 'puppet5'
     MATRIX_RUBY_VERSION: '2.4'
 
-.pup_5_5_10: &pup_5_5_10
+.pup_5_5_16: &pup_5_5_16
   image: 'ruby:2.4'
   variables:
-    PUPPET_VERSION: '5.5.10'
+    PUPPET_VERSION: '5.5.16'
     BEAKER_PUPPET_COLLECTION: 'puppet5'
     MATRIX_RUBY_VERSION: '2.4'
 
@@ -149,8 +149,8 @@ pup5-unit:
   <<: *pup_5
   <<: *unit_tests
 
-pup5.5.10-unit:
-  <<: *pup_5_5_10
+pup5.5.16-unit:
+  <<: *pup_5_5_16
   <<: *unit_tests
 
 pup6-unit:
@@ -159,26 +159,26 @@ pup6-unit:
 
 # Acceptance tests
 # ==============================================================================
-pup5.5.10:
-  <<: *pup_5_5_10
+pup5.5.16:
+  <<: *pup_5_5_16
   <<: *acceptance_base
   script:
     - 'bundle exec rake beaker:suites'
 
-pup5.5.10-fips:
-  <<: *pup_5_5_10
+pup5.5.16-fips:
+  <<: *pup_5_5_16
   <<: *acceptance_base
   script:
     - 'BEAKER_fips=yes bundle exec rake beaker:suites'
 
-pup5.5.10-oel:
-  <<: *pup_5_5_10
+pup5.5.16-oel:
+  <<: *pup_5_5_16
   <<: *acceptance_base
   script:
     - 'bundle exec rake beaker:suites[default,oel]'
 
-pup5.5.10-oel-fips:
-  <<: *pup_5_5_10
+pup5.5.16-oel-fips:
+  <<: *pup_5_5_16
   <<: *acceptance_base
   <<: *only_with_SIMP_FULL_MATRIX
   script:

.ruby-version

@@ -1 +1 @@
-2.4.4
+2.4.5

CHANGELOG

@@ -1,3 +1,7 @@
+* Tue Dec 10 2019 Trevor Vaughan <tvaughan@onyxpoint.com> - 0.5.0-0
+- Add EL8 support
+- Remove pinned versions of incron since the upstream packages have been fixed
+
 * Fri Aug 02 2019 Robert Vincent <pillarsdotnet@gmail.com> - 0.5.0-0
 - Remove Puppet 4 support
 - Add Puppet 6 support

Gemfile

@@ -4,7 +4,7 @@ gem_sources.each { |gem_source| source gem_source }
 
 group :test do
   gem 'rake'
-  gem 'puppet', ENV.fetch('PUPPET_VERSION',  '~> 5.5')
+  gem 'puppet', ENV.fetch('PUPPET_VERSION', '~> 5.5')
   gem 'rspec'
   gem 'rspec-puppet'
   gem 'hiera-puppet-helper'
@@ -13,8 +13,8 @@ group :test do
   gem 'puppet-strings'
   gem 'puppet-lint-empty_string-check',   :require => false
   gem 'puppet-lint-trailing_comma-check', :require => false
-  gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', '~> 2.2')
-  gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', '~> 5.6')
+  gem 'simp-rspec-puppet-facts', ENV.fetch('SIMP_RSPEC_PUPPET_FACTS_VERSION', ['>= 2.4.0', '< 3.0.0'] )
+  gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', ['>= 5.9', '< 6.0'])
 end
 
 group :development do
@@ -25,5 +25,5 @@ end
 group :system_tests do
   gem 'beaker'
   gem 'beaker-rspec'
-  gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 1.12')
+  gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', ['>= 1.17.0', '< 2.0.0'])
 end

README.md

@@ -20,6 +20,10 @@
 
 This module manages the incron packages, service, and /etc/incron.allow.
 
+**WARNING:**
+
+> There were issues in early versions of incron 0.5.12. Please ensure that you
+> are using at least version 0.5.12-10 or later on EL 7+.
 
 ### This is a SIMP module
 
@@ -41,7 +45,6 @@ https://simp-project.atlassian.net/.
 
 ## Setup
 
-
 ### What incron affects
 
   * incron package

REFERENCE.md

@@ -17,6 +17,10 @@
 
 * [`incron_system_table`](#incron_system_table): Creates an 'incrond' compatible system table  Line order will be preserved  Any paths that contain globs '*' will be expanded into the approp
 
+**Data types**
+
+* [`Incron::Mask`](#incronmask): Valid incron masks
+
 ## Classes
 
 ### incron
@@ -30,14 +34,12 @@ The following parameters are available in the `incron` class.
 
 ##### `package_ensure`
 
-Data type: `String[1]`
+Data type: `String`
 
 The ``ensure`` parameter of ``Package`` resources in the ``incron``
 namespace.
 
-See Module Data for defaults
-
-WARNING: Do NOT change this unless you've 100% tested your system!
+Default value: simplib::lookup('simp_options::package_ensure', { 'default_value' => 'installed' })
 
 ##### `users`
 
@@ -202,7 +204,7 @@ The following properties are available in the `incron_system_table` type.
 
 Valid values: present, absent
 
-The basic property that the resource should be in.
+The state that should be enforced for the table
 
 Default value: present
 
@@ -235,3 +237,11 @@ lines that contain all possible combinations
 
 Raw content to add to the file - Will be validated
 
+## Data types
+
+### Incron::Mask
+
+Valid incron masks
+
+Alias of `Enum['IN_ACCESS', 'IN_ALL_EVENTS', 'IN_ATTRIB', 'IN_CLOSE', 'IN_CLOSE_NOWRITE', 'IN_CLOSE_WRITE', 'IN_CREATE', 'IN_DELETE', 'IN_DELETE_SELF', 'IN_DONT_FOLLOW', 'IN_MODIFY', 'IN_MOVE', 'IN_MOVED_FROM', 'IN_MOVED_TO', 'IN_MOVE_SELF', 'IN_NO_LOOP', 'IN_ONESHOT', 'IN_ONLYDIR', 'IN_OPEN', 'loopable=true', 'recursive=false', 'dotdirs=true']`
+

lib/puppet/type/incron_system_table.rb

@@ -15,6 +15,8 @@
   EOM
 
   ensurable do
+    desc 'The state that should be enforced for the table'
+
     defaultvalues
     defaultto :present
   end

manifests/init.pp

@@ -5,10 +5,6 @@
 #   The ``ensure`` parameter of ``Package`` resources in the ``incron``
 #   namespace.
 #
-#   See Module Data for defaults
-#
-#   WARNING: Do NOT change this unless you've 100% tested your system!
-#
 # @param users
 #   An Array of additional incron users, using the defined type
 #   incron::user.
@@ -28,11 +24,11 @@
 #   Whether or not to purge unknown incron tables
 #
 class incron (
-  String[1]                             $package_ensure,
   Array[String[1]]                      $users          = [],
   Hash                                  $system_table   = {},
   Variant[Enum['unlimited'],Integer[0]] $max_open_files = 'unlimited',
   Boolean                               $purge          = false,
+  String                                $package_ensure = simplib::lookup('simp_options::package_ensure', { 'default_value' => 'installed' })
 ) {
   package { 'incron': ensure => $package_ensure }
 

metadata.json

@@ -21,29 +21,32 @@
     },
     {
       "name": "simp/simplib",
-      "version_requirement": ">= 3.4.0 < 4.0.0"
+      "version_requirement": ">= 3.4.0 < 5.0.0"
     }
   ],
   "operatingsystem_support": [
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "6",
-        "7"
+        "8",
+        "7",
+        "6"
       ]
     },
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "6",
-        "7"
+        "8",
+        "7",
+        "6"
       ]
     },
     {
       "operatingsystem": "OracleLinux",
       "operatingsystemrelease": [
-        "6",
-        "7"
+        "8",
+        "7",
+        "6"
       ]
     }
   ],

spec/acceptance/nodesets/default.yml

@@ -13,51 +13,20 @@ HOSTS:
     platform:   el-7-x86_64
     box:        centos/7
     hypervisor: <%= hypervisor %>
-    yum_repos:
-      epel:
-        mirrorlist: 'https://mirrors.fedoraproject.org/metalink?repo=epel-7&arch=$basearch'
-        gpgkeys:
-          - https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-$releasever
-      simp:
-        baseurl: 'https://packagecloud.io/simp-project/6_X/el/$releasever/$basearch'
-        gpgkeys:
-          - https://raw.githubusercontent.com/NationalSecurityAgency/SIMP/master/GPGKEYS/RPM-GPG-KEY-SIMP
-          - https://download.simp-project.com/simp/GPGKEYS/RPM-GPG-KEY-SIMP-6
-      simp_dependencies:
-        baseurl: 'https://packagecloud.io/simp-project/6_X_Dependencies/el/$releasever/$basearch'
-        gpgkeys:
-          - https://raw.githubusercontent.com/NationalSecurityAgency/SIMP/master/GPGKEYS/RPM-GPG-KEY-SIMP
-          - https://download.simp-project.com/simp/GPGKEYS/RPM-GPG-KEY-SIMP-6
-          - https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
-          - https://yum.puppetlabs.com/RPM-GPG-KEY-puppet
-          - https://apt.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-94
-          - https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-$releasever
 
   el6:
     roles:
       - client
     platform:   el-6-x86_64
     box:        centos/6
     hypervisor: <%= hypervisor %>
-    yum_repos:
-      epel:
-        mirrorlist: 'https://mirrors.fedoraproject.org/metalink?repo=epel-6&arch=$basearch'
-        gpgkeys:
-          - https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-$releasever
-      simp:
-        baseurl: 'https://packagecloud.io/simp-project/6_X/el/$releasever/$basearch'
-        gpgkeys:
-          - https://raw.githubusercontent.com/NationalSecurityAgency/SIMP/master/GPGKEYS/RPM-GPG-KEY-SIMP
-          - https://download.simp-project.com/simp/GPGKEYS/RPM-GPG-KEY-SIMP-6
-      simp_dependencies:
-        baseurl: 'https://packagecloud.io/simp-project/6_X_Dependencies/el/$releasever/$basearch'
-        gpgkeys:
-          - https://raw.githubusercontent.com/NationalSecurityAgency/SIMP/master/GPGKEYS/RPM-GPG-KEY-SIMP
-          - https://download.simp-project.com/simp/GPGKEYS/RPM-GPG-KEY-SIMP-6
-          - https://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs
-          - https://yum.puppetlabs.com/RPM-GPG-KEY-puppet
-          - https://apt.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-94
-          - https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-$releasever
+
+  el8:
+    roles:
+      - client
+    platform:   el-8-x86_64
+    box:        centos/8
+    hypervisor: <%= hypervisor %>
 
 CONFIG:
   log_level: verbose