Skip to content

Drop Puppet 7/Ruby 2.7 support #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Drop Puppet 7/Ruby 2.7 support #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08c77b7
Drop Puppet 7/Ruby 2.7 support
silug Sep 24, 2025
7509767
Update beaker nodesets
silug Sep 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 14 additions & 21 deletions .github/workflows/pr_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@
#
# ==============================================================================
#
# The testing matrix considers ruby/puppet versions supported by SIMP and PE:
# The testing matrix considers ruby/puppet versions supported by SIMP:
# ------------------------------------------------------------------------------
# Release Puppet Ruby EOL
# PE 2019.8 6.22 2.5 2022-12 (LTS)
# PE 2021.Y 7.x 2.7 Quarterly updates
# Puppet Ruby EOL
# 8.x 3.2 TBD
#
# https://puppet.com/docs/pe/latest/component_versions_in_recent_pe_releases.html
# https://puppet.com/misc/puppet-enterprise-lifecycle
# ==============================================================================
#
# https://docs.github.com/en/actions/reference/events-that-trigger-workflows
Expand All @@ -27,18 +24,18 @@ on:
types: [opened, reopened, synchronize]

env:
PUPPET_VERSION: '~> 7'
PUPPET_VERSION: '~> 8'

jobs:
puppet-syntax:
name: 'Puppet Syntax'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- name: "Install Ruby 2.7"
- name: "Install Ruby 3.2"
uses: ruby/setup-ruby@v1 # ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0
with:
ruby-version: 2.7
ruby-version: 3.2
bundler-cache: true
- run: "bundle exec rake syntax"

Expand All @@ -47,10 +44,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- name: "Install Ruby 2.7"
- name: "Install Ruby 3.2"
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.2
bundler-cache: true
- run: "bundle exec rake lint"
- run: "bundle exec rake metadata_lint"
Expand All @@ -61,10 +58,10 @@ jobs:
continue-on-error: true
steps:
- uses: actions/checkout@v5
- name: "Install Ruby 2.7"
- name: "Install Ruby 3.2"
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.2
bundler-cache: true
- run: |
bundle show
Expand All @@ -75,10 +72,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- name: 'Install Ruby 2.7'
- name: 'Install Ruby 3.2'
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.2
bundler-cache: true
- run: bundle exec rake check:dot_underscore
- run: bundle exec rake check:test_file
Expand All @@ -88,10 +85,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- name: 'Install Ruby 2.7'
- name: 'Install Ruby 3.2'
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.2
bundler-cache: true
- name: 'Tags and changelogs'
run: |
Expand All @@ -108,10 +105,6 @@ jobs:
strategy:
matrix:
puppet:
- 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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tag_deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ on:
- '[0-9]+\.[0-9]+\.[0-9]+\-[a-z]+[0-9]+'

env:
PUPPET_VERSION: '~> 7'
PUPPET_VERSION: '~> 8'

jobs:
releng-checks:
Expand All @@ -55,7 +55,7 @@ jobs:
clean: true
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.2
bundler-cache: true
- run: bundle exec rake pkg:check_version
- run: bundle exec rake pkg:compare_latest_tag
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
clean: true
- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7
ruby-version: 3.2
bundler-cache: true
- name: Build Puppet module (PDK)
run: bundle exec pdk build --force
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins:
AllCops:
NewCops: enable
DisplayCopNames: true
TargetRubyVersion: 2.7
TargetRubyVersion: 3.2
Include:
- "**/*.rb"
Exclude:
Expand Down
5 changes: 2 additions & 3 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,10 @@ group :syntax do
end

group :test do
puppet_version = ENV.fetch('PUPPET_VERSION', ['>= 7', '< 9'])
puppet_version = ENV.fetch('PUPPET_VERSION', '~> 8.0')
major_puppet_version = Array(puppet_version).first.scan(%r{(\d+)(?:\.|\Z)}).flatten.first.to_i
gem 'hiera-puppet-helper'
gem 'pathspec', '~> 0.2' if Gem::Requirement.create('< 2.6').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem('pdk', ENV.fetch('PDK_VERSION', ['>= 2.0', '< 4.0']), require: false) if major_puppet_version > 5
gem('pdk', ENV.fetch('PDK_VERSION', '~> 3.0'), require: false)
gem 'puppet', puppet_version
gem 'puppetlabs_spec_helper'
gem 'puppet-strings'
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 7.0.0 < 9.0.0"
"version_requirement": ">= 8.0.0 < 9.0.0"
}
]
}
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,4 @@ CONFIG:
- hmac-md5
- hmac-md5-96
- none
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/oel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@ CONFIG:
- hmac-md5
- hmac-md5-96
- none
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
2 changes: 1 addition & 1 deletion spec/acceptance/suites/ad/nodesets/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@ CONFIG:
- hmac-md5
- hmac-md5-96
- none
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
2 changes: 1 addition & 1 deletion spec/acceptance/suites/ad/nodesets/oel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,4 @@ CONFIG:
- hmac-md5
- hmac-md5-96
- none
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
2 changes: 1 addition & 1 deletion spec/acceptance/suites/ds389/nodesets/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ CONFIG:
- hmac-md5
- hmac-md5-96
- none
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
2 changes: 1 addition & 1 deletion spec/acceptance/suites/ds389/nodesets/oel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ CONFIG:
- hmac-md5
- hmac-md5-96
- none
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
2 changes: 1 addition & 1 deletion spec/acceptance/suites/ldap/nodesets/default.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ CONFIG:
- hmac-md5
- hmac-md5-96
- none
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
2 changes: 1 addition & 1 deletion spec/acceptance/suites/ldap/nodesets/oel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@ CONFIG:
- hmac-md5
- hmac-md5-96
- none
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet7') %>"
puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
Loading