Skip to content

Commit

Permalink
Finalize RockyLinux 8 support
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
michael-riddle committed Jul 31, 2023
1 parent 91dfe98 commit 927e6a5
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/pr_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,17 @@ 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
fail-fast: false
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 +129,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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,4 @@ dist
/junit
/log
/doc
/Gemfile.lock
1 change: 1 addition & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ pup7.pe-unit:
<<: *pup_7_pe
<<: *unit_tests

# Commenting until Puppet 8 is released
#pup8.x-unit:
# <<: *pup_8_x
# <<: *unit_tests
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
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

0 comments on commit 927e6a5

Please sign in to comment.