diff --git a/.github/workflows/pr_tests.yml b/.github/workflows/pr_tests.yml index 5f70562..3bd2c9f 100644 --- a/.github/workflows/pr_tests.yml +++ b/.github/workflows/pr_tests.yml @@ -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 @@ -27,7 +24,7 @@ on: types: [opened, reopened, synchronize] env: - PUPPET_VERSION: '~> 7' + PUPPET_VERSION: '~> 8' jobs: puppet-syntax: @@ -35,10 +32,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 # ruby/setup-ruby@ec106b438a1ff6ff109590de34ddc62c540232e0 with: - ruby-version: 2.7 + ruby-version: 3.2 bundler-cache: true - run: "bundle exec rake syntax" @@ -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" @@ -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 @@ -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 @@ -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: | @@ -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' diff --git a/.github/workflows/tag_deploy.yml b/.github/workflows/tag_deploy.yml index 0c91ff1..cc5d182 100644 --- a/.github/workflows/tag_deploy.yml +++ b/.github/workflows/tag_deploy.yml @@ -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: @@ -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 @@ -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 diff --git a/.rubocop.yml b/.rubocop.yml index 6e2c30d..126f42e 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -6,7 +6,7 @@ plugins: AllCops: NewCops: enable DisplayCopNames: true - TargetRubyVersion: 2.7 + TargetRubyVersion: 3.2 Include: - "**/*.rb" Exclude: diff --git a/Gemfile b/Gemfile index c6cd25b..6baf9ba 100644 --- a/Gemfile +++ b/Gemfile @@ -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' diff --git a/metadata.json b/metadata.json index ce4b74b..bc6094f 100644 --- a/metadata.json +++ b/metadata.json @@ -80,7 +80,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 7.0.0 < 9.0.0" + "version_requirement": ">= 8.0.0 < 9.0.0" } ] } diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml index 6fa32f9..a556164 100644 --- a/spec/acceptance/nodesets/default.yml +++ b/spec/acceptance/nodesets/default.yml @@ -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') %>" diff --git a/spec/acceptance/nodesets/oel.yml b/spec/acceptance/nodesets/oel.yml index 3e39390..1c5b34f 100644 --- a/spec/acceptance/nodesets/oel.yml +++ b/spec/acceptance/nodesets/oel.yml @@ -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') %>" diff --git a/spec/acceptance/suites/ad/nodesets/default.yml b/spec/acceptance/suites/ad/nodesets/default.yml index cab10da..1e9aaa1 100644 --- a/spec/acceptance/suites/ad/nodesets/default.yml +++ b/spec/acceptance/suites/ad/nodesets/default.yml @@ -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') %>" diff --git a/spec/acceptance/suites/ad/nodesets/oel.yml b/spec/acceptance/suites/ad/nodesets/oel.yml index a45a3b9..e8817d6 100644 --- a/spec/acceptance/suites/ad/nodesets/oel.yml +++ b/spec/acceptance/suites/ad/nodesets/oel.yml @@ -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') %>" diff --git a/spec/acceptance/suites/ds389/nodesets/default.yml b/spec/acceptance/suites/ds389/nodesets/default.yml index 35b243a..b637e73 100644 --- a/spec/acceptance/suites/ds389/nodesets/default.yml +++ b/spec/acceptance/suites/ds389/nodesets/default.yml @@ -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') %>" diff --git a/spec/acceptance/suites/ds389/nodesets/oel.yml b/spec/acceptance/suites/ds389/nodesets/oel.yml index 8ef649e..e8631fc 100644 --- a/spec/acceptance/suites/ds389/nodesets/oel.yml +++ b/spec/acceptance/suites/ds389/nodesets/oel.yml @@ -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') %>" diff --git a/spec/acceptance/suites/ldap/nodesets/default.yml b/spec/acceptance/suites/ldap/nodesets/default.yml index 945f336..6022271 100644 --- a/spec/acceptance/suites/ldap/nodesets/default.yml +++ b/spec/acceptance/suites/ldap/nodesets/default.yml @@ -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') %>" diff --git a/spec/acceptance/suites/ldap/nodesets/oel.yml b/spec/acceptance/suites/ldap/nodesets/oel.yml index cbe59c1..ed9e2d3 100644 --- a/spec/acceptance/suites/ldap/nodesets/oel.yml +++ b/spec/acceptance/suites/ldap/nodesets/oel.yml @@ -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') %>"