Skip to content

Commit

Permalink
(SIMP-7202) Add EL8 support (#35)
Browse files Browse the repository at this point in the history
SIMP-7202 #comment Add EL8 support for acpid
  • Loading branch information
trevor-vaughan authored and lnemsick-simp committed Dec 9, 2019
1 parent 7c9bb01 commit ef880f3
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 22 deletions.
26 changes: 13 additions & 13 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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^^^
#
Expand Down Expand Up @@ -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'

Expand Down Expand Up @@ -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:
Expand All @@ -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[default]'

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[default]'

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:
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Fri Dec 06 2019 Trevor Vaughan <[email protected]> - 1.2.0-0
- Add EL8 support

* Tue Aug 20 2019 Liz Nemsick <[email protected]> - 1.1.0-0
- Drop Puppet 4 support
- Add Puppet 6 support
Expand Down
7 changes: 3 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,17 @@ 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.3.1', '< 3.0.0'] )
gem 'simp-rake-helpers', ENV.fetch('SIMP_RAKE_HELPERS_VERSION', ['>= 5.9', '< 6.0'])
end

group :development do
gem 'pry'
gem 'pry-byebug'
gem 'pry-doc'
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
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

This module installs the `acpid` package and ensures the service is running.

See [REFERENCE.md](./REFERENCE.md) for additional information.

### This is a SIMP module

This module is a component of the [System Integrity Management Platform](https://simp-project.com),
Expand Down
32 changes: 32 additions & 0 deletions REFERENCE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Reference
<!-- DO NOT EDIT: This document was generated by Puppet Strings -->

## Table of Contents

**Classes**

* [`acpid`](#acpid): This class provides for the setup of the ACPI management subsystem. This will eventually grow to encompass all acpid capabilities. NOTE: Th

## Classes

### acpid

This class provides for the setup of the ACPI management subsystem.

This will eventually grow to encompass all acpid capabilities.

NOTE: This is NOT compatible with GFS2 and should not be included with it.
They will deliberately step on one another.

#### Parameters

The following parameters are available in the `acpid` class.

##### `ensure`

Data type: `String`

Management of the acpid package.

Default value: simplib::lookup('simp_options::package_ensure', { 'default_value' => 'installed' })

12 changes: 7 additions & 5 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simp-acpid",
"version": "1.1.0",
"version": "1.2.0",
"author": "SIMP Team",
"summary": "Manages ACPI daemon",
"license": "Apache-2.0",
Expand All @@ -25,15 +25,17 @@
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"6",
"7"
"8",
"7",
"6"
]
},
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"6",
"7"
"8",
"7",
"6"
]
},
{
Expand Down
7 changes: 7 additions & 0 deletions spec/acceptance/nodesets/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ HOSTS:
box: centos/7
hypervisor: <%= hypervisor %>

el8:
roles:
- client
platform: el-8-x86_64
box: centos/8
hypervisor: <%= hypervisor %>

CONFIG:
log_level: verbose
synced_folder : disabled
Expand Down

0 comments on commit ef880f3

Please sign in to comment.