Skip to content

Commit

Permalink
Add RockyLinux 8 support (#57)
Browse files Browse the repository at this point in the history
* Add RockyLinux 8 support

This patch adds support for RockyLinux 8

The patch enforces a standardized asset baseline using simp/puppetsync,
and may also apply other updates to ensure conformity.

* Fix Gemfile to resolve rake-helpers 5.20.0

* Update .puppet-lint.rc for rake-helpers 5.20.0

* Add experimental pup8 to GHA matrix
  • Loading branch information
op-ct authored Jul 19, 2023
1 parent 476556d commit 9db47d7
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 8 deletions.
11 changes: 7 additions & 4 deletions .github/workflows/pr_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,16 @@ jobs:
strategy:
matrix:
puppet:
- label: 'Puppet 7.x'
puppet_version: '~> 7.21.0'
- label: 'Puppet 7.x [SIMP 6.6/PE 2021.7]'
puppet_version: '~> 7.0'
ruby_version: '2.7'
experimental: false
- label: 'Puppet 8.x'
puppet_version: '~> 8.0'
ruby_version: '3.2'
ruby_version: 3.1
experimental: true
env:
PUPPET_VERSION: '${{matrix.puppet.puppet_version}}'
PUPPET_VERSION: ${{matrix.puppet.puppet_version}}
steps:
- uses: actions/checkout@v3
- name: 'Install Ruby ${{matrix.puppet.ruby_version}}'
Expand All @@ -126,6 +128,7 @@ jobs:
bundler-cache: true
- run: 'command -v rpm || if command -v apt-get; then sudo apt-get update; sudo apt-get install -y rpm; fi ||:'
- run: 'bundle exec rake spec'
continue-on-error: ${{matrix.puppet.experimental}}

# dump_contexts:
# name: 'Examine Context contents'
Expand Down
2 changes: 1 addition & 1 deletion .puppet-lint.rc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
--no-class_inherits_from_params_class-check
--no-140chars-check
--no-trailing_comma-check
--no-empty_string_assignment-check
--no-params-empty-string-assignment-check
# This is here because the code can't handle lookups in parameters and SIMP
# modules have a LOT of those
--no-parameter_order-check
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Mon Jun 12 2023 Chris Tessmer <chris.tessmer@onyxpoint.com> - 0.8.0
- Add RockyLinux 8 support

* Wed Jun 30 2021 Trevor Vaughan <tvaughan@onyxpoint.com> - 0.7.0
- Fixed a bug in the Augeas template
- Adjusted the tests to effect change on a switch to/from NetworkManager
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ group :test do
gem 'puppetlabs_spec_helper'
gem 'metadata-json-lint'
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['SIMP_RSPEC_PUPPET_FACTS_VERSION'] || '~> 3.1'
gem 'simp-rake-helpers', ENV['SIMP_RAKE_HELPERS_VERSION'] || ['>= 5.12.1', '< 6']
Expand Down
10 changes: 8 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simp-resolv",
"version": "0.7.0",
"version": "0.8.0",
"author": "SIMP Team",
"summary": "A SIMP Puppet module for managing client-side DNS settings",
"license": "Apache-2.0",
Expand All @@ -23,7 +23,7 @@
},
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 6.6.0 < 8.0.0"
"version_requirement": ">= 8.0.0 < 9.0.0"
}
],
"operatingsystem_support": [
Expand All @@ -47,6 +47,12 @@
"7",
"8"
]
},
{
"operatingsystem": "Rocky",
"operatingsystemrelease": [
"8"
]
}
],
"requirements": [
Expand Down

0 comments on commit 9db47d7

Please sign in to comment.