(SIMP-4009) Added Puppet 5 and OEL support (#31)

SIMP-4009 #comment simp-upstart Puppet 5 and OEL support

.gitlab-ci.yml

@@ -5,11 +5,9 @@
 # https://puppet.com/docs/pe/2017.3/overview/getting_support_for_pe.html#standard-releases-and-long-term-support-releases
 # ------------------------------------------------------------------------------
 #  release    pup   ruby      eol
-# PE 2016.4   4.7   2.1.9  2018-10  (LTS)
-# SIMP6.0.0   4.8   2.1.9  TBD
 # PE 2017.2   4.10  2.1.9  2018-02-21
 # PE 2017.3   5.3   2.4.1  2018-07
-# PE 2018.1   ???   ?????  ????-??  (LTS)
+# PE 2018.1   5.5   2.4.4  ????-??  (LTS)
 ---
 .cache_bundler: &cache_bundler
   cache:
@@ -52,110 +50,88 @@ stages:
   - acceptance
   - deploy
 
-# Puppet 4.7 for PE 2016.4 LTS Support (EOL: 2018-10-21)
-# See: https://puppet.com/misc/puppet-enterprise-lifecycle
-# --------------------------------------
-pup4_7-validation:
-  stage: validation
-  tags:
-    - docker
-  image: ruby:2.1
-  variables:
-    PUPPET_VERSION: '~> 4.7.0'
-  <<: *cache_bundler
-  <<: *setup_bundler_env
-  <<: *validation_checks
-
-pup4_7-unit:
-  stage: unit
-  tags:
-    - docker
-  image: ruby:2.1
-  variables:
-    PUPPET_VERSION: '~> 4.7.0'
-  <<: *cache_bundler
-  <<: *setup_bundler_env
-  <<: *spec_tests
-
+# To avoid running a prohibitive number of tests every commit,
+# don't set this env var in your gitlab instance
+.only_with_SIMP_FULL_MATRIX: &only_with_SIMP_FULL_MATRIX
+  only:
+    variables:
+      - $SIMP_FULL_MATRIX
 
-# Puppet 4.8 for SIMP 6.0 + 6.1 support
+# Puppet 4.10 for PE 2017.2 support (EOL:2018-02-21)
+# See: https://puppet.com/misc/puppet-enterprise-lifecycle
 # --------------------------------------
-pup4_8-validation:
+pup4_10-validation:
   stage: validation
   tags:
     - docker
   image: ruby:2.1
   variables:
-    PUPPET_VERSION: '~> 4.8.0'
+    PUPPET_VERSION: '~> 4.10.0'
   <<: *cache_bundler
   <<: *setup_bundler_env
   <<: *validation_checks
 
-pup4_8-unit:
+pup4_10-unit:
   stage: unit
   tags:
     - docker
   image: ruby:2.1
   variables:
-    PUPPET_VERSION: '~> 4.8.0'
+    PUPPET_VERSION: '~> 4.10.0'
   <<: *cache_bundler
   <<: *setup_bundler_env
   <<: *spec_tests
 
 
-# Puppet 4.10 for PE 2017.2 support (EOL:2018-02-21)
+# Puppet 5.3 for PE 2017.3 support (EOL: 2018-07)
 # See: https://puppet.com/misc/puppet-enterprise-lifecycle
 # --------------------------------------
-pup4_10-validation:
+pup5_3-validation:
   stage: validation
   tags:
     - docker
-  image: ruby:2.1
+  image: ruby:2.4
   variables:
-    PUPPET_VERSION: '~> 4.10.0'
+    PUPPET_VERSION: '~> 5.3.0'
   <<: *cache_bundler
   <<: *setup_bundler_env
   <<: *validation_checks
+  allow_failure: true
 
-pup4_10-unit:
+pup5_3-unit:
   stage: unit
   tags:
     - docker
-  image: ruby:2.1
+  image: ruby:2.4
   variables:
-    PUPPET_VERSION: '~> 4.10.0'
+    PUPPET_VERSION: '~> 5.3.0'
   <<: *cache_bundler
   <<: *setup_bundler_env
   <<: *spec_tests
 
-
-# Puppet 5.3 for PE 2017.3 support (EOL: 2018-07)
+# Puppet 5.5 for PE 2018.1 support (EOL: 2018-07)
 # See: https://puppet.com/misc/puppet-enterprise-lifecycle
 # --------------------------------------
-pup5_3-validation:
+pup5_5-validation:
   stage: validation
   tags:
     - docker
   image: ruby:2.4
   variables:
-    PUPPET_VERSION: '~> 5.3.0'
+    PUPPET_VERSION: '~> 5.5.0'
   <<: *cache_bundler
   <<: *setup_bundler_env
   <<: *validation_checks
-  allow_failure: true
-
-pup5_3-unit:
+pup5_5-unit:
   stage: unit
   tags:
     - docker
   image: ruby:2.4
   variables:
-    PUPPET_VERSION: '~> 5.3.0'
+    PUPPET_VERSION: '~> 5.5.0'
   <<: *cache_bundler
   <<: *setup_bundler_env
   <<: *spec_tests
-  allow_failure: true
-
 
 # Keep an eye on the latest puppet 5
 # ----------------------------------

.travis.yml

@@ -1,10 +1,6 @@
 # The testing matrix considers ruby/puppet versions supported by SIMP and PE:
 # ------------------------------------------------------------------------------
 #  release    pup   ruby      eol
-# PE 2016.4   4.7   2.1.9  TBD (LTS)
-# PE 2016.5   4.8   2.1.9  2017-10-31
-# SIMP6.0.0   4.8   2.1.9  TBD
-# PE 2017.1   4.9   2.1.9  2017-10-31
 # PE 2017.2   4.10  2.1.9  TBD
 ---
 language: ruby
@@ -25,9 +21,6 @@ before_install:
   - rm -f Gemfile.lock
 
 jobs:
-  allow_failures:
-    - env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 5.0"
-
   include:
     - stage: check
       rvm: 2.4.1
@@ -54,18 +47,6 @@ jobs:
       script:
         - bundle exec rake spec
 
-    - stage: spec
-      rvm: 2.1.9
-      env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 4.9.2"
-      script:
-        - bundle exec rake spec
-
-    - stage: spec
-      rvm: 2.1.9
-      env: STRICT_VARIABLES=yes TRUSTED_NODE_DATA=yes PUPPET_VERSION="~> 4.7.0"
-      script:
-        - bundle exec rake spec
-
     - stage: deploy
       rvm: 2.4.1
       script:

CHANGELOG

@@ -1,3 +1,8 @@
+* Thu Sep 13 2018 Nicholas Markowski <nicholas.markowski@onyxpoint.com> - 6.0.3-0
+- Added Puppet 5 and OEL support
+- Dropped support for Hiera v4.  Dependency auditd has dropped support
+  for Hiera v4, causing Puppet 4.7 tests to fail in this module.
+
 * Thu Jun 07 2018 Liz Nemsick <lnemsick.simp@gmail.com> - 6.0.2-0
 - Advance beyond bad changelog entry
 

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "simp-upstart",
-  "version": "6.0.2",
+  "version": "6.0.3",
   "author": "SIMP Team",
   "summary": "A SIMP puppet module for managing upstart",
   "license": "Apache-2.0",
@@ -36,12 +36,19 @@
         "6",
         "7"
       ]
+    },
+    {
+      "operatingsystem": "OracleLinux",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
     }
   ],
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.7.0 < 5.0.0"
+      "version_requirement": ">= 4.10.4 < 6.0.0"
     }
   ]
 }

spec/classes/init_spec.rb

@@ -8,7 +8,7 @@
       context "on #{os}" do
         let(:facts) do
           facts = os_facts.dup
-          if ['RedHat','CentOS'].include?(os_facts[:operatingsystem]) &&
+          if ['RedHat','CentOS','OracleLinux'].include?(os_facts[:operatingsystem]) &&
              (os_facts[:operatingsystemmajrelease].to_s < '7')
 
             facts[:apache_version] = '2.2'