Drop Puppet 7 and EL7 support

.github/workflows/ci.yaml

@@ -16,11 +16,7 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: 2.7.7
-            puppet: 7
-            fixtures: .fixtures.yml
-            allow_failure: false
-          - ruby: 3.2.2
+          - ruby: 3.2.3
             puppet: 8
             fixtures: .fixtures.yml
             allow_failure: false
@@ -43,14 +39,14 @@ jobs:
       - name: Run tests
         run: bundle exec rake parallel_spec
   acceptance:
-    runs-on: ubuntu-latest
+    # Run on 22.04 until newer doesn't cause ioctl errors for el10 tests
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
         set:
           - "el8"
         puppet:
-          - "puppet7"
           - "puppet8"
     env:
       BUNDLE_WITHOUT: development:release
@@ -73,10 +69,10 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: '3.2'
           bundler-cache: true
-          cache-version: 2
-          bundler: '2.1.0'
+          cache-version: 3
+          bundler: '2.4.13'
       - name: Run tests
         run: bundle exec rake beaker
         env:

.rubocop.yml

@@ -59,7 +59,15 @@ Style/TernaryParentheses:
 Style/TrailingCommaInArguments:
   Description: Prefer always trailing comma on multiline argument lists. This makes
     diffs, and re-ordering nicer.
-  EnforcedStyleForMultiline: comma
+  EnforcedStyleForMultiline: consistent_comma
+Style/TrailingCommaInArrayLiteral:
+  Description: Prefer always trailing comma on multiline argument lists. This makes
+    diffs, and re-ordering nicer.
+  EnforcedStyleForMultiline: consistent_comma
+Style/TrailingCommaInHashLiteral:
+  Description: Prefer always trailing comma on multiline argument lists. This makes
+    diffs, and re-ordering nicer.
+  EnforcedStyleForMultiline: consistent_comma
 Style/SymbolArray:
   Description: Using percent style obscures symbolic intent of array's contents.
   EnforcedStyle: brackets

.sync.yml

@@ -2,11 +2,9 @@
 .github/workflows/ci.yaml:
   acceptance_matrix:
       set:
-        - ---el7
         - el8
         - ---el9
       puppet:
-        - puppet7
         - puppet8
   acceptance_env_vars:
     GEOIP_USERID: '${{ secrets.GEOIP_USERID }}'
@@ -21,13 +19,6 @@ appveyor.yml:
       configs:
         RSpec/RepeatedExampleGroupBody:
           Enabled: false
-spec/acceptance/nodesets/el7.yml:
-  roles:
-    - compute
-    - db
-    - akrr
-    - supremm
-    - web
 spec/acceptance/nodesets/el8.yml:
   roles:
     - compute
@@ -37,6 +28,8 @@ spec/acceptance/nodesets/el8.yml:
     - web
 spec/acceptance/nodesets/el9.yml:
   delete: true
+spec/acceptance/nodesets/el10.yml:
+  delete: true
 spec/acceptance/nodesets/debian-11.yml:
   delete: true
 spec/acceptance/nodesets/debian-12.yml:
@@ -45,6 +38,8 @@ spec/acceptance/nodesets/ubuntu-2004.yml:
   delete: true
 spec/acceptance/nodesets/ubuntu-2204.yml:
   delete: true
+spec/acceptance/nodesets/ubuntu-2404.yml:
+  delete: true
 Rakefile:
   extras:
     - "desc 'Run beaker full acceptance tests'"

Gemfile

@@ -17,19 +17,19 @@ ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
 minor_version = ruby_version_segments[0..1].join('.')
 
 group :development do
-  gem "voxpupuli-test", '7.0.0',    require: false
+  gem "voxpupuli-test", '9.2.1',    require: false
   gem "faraday", '~> 1.0',          require: false
   gem "github_changelog_generator", require: false
   gem "puppet-blacksmith",          require: false
   gem "puppet-strings",             require: false
 end
 group :system_tests do
-  gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.29')
+  gem "beaker",                                                                  require: false
   gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
   gem "beaker-pe",                                                               require: false
   gem "beaker-hostgenerator"
   gem "beaker-rspec"
-  gem "beaker-docker",               git: 'https://github.com/treydock/beaker-docker.git', branch: 'amazon-2023'
+  gem "beaker-docker", '~> 2.2.0',                                               require: false
   gem "beaker-puppet",               git: 'https://github.com/puppetlabs/beaker-puppet.git', ref: '6063d22b6c4449df795731f5853c3c75241240c4'
   gem "beaker-puppet_install_helper",                                            require: false
   gem "beaker-module_install_helper",                                            require: false

README.md

@@ -251,5 +251,4 @@ xdmod::supremm_database: true
 
 This module has been tested on:
 
-* RedHat/CentOS 7
 * RedHat/Rocky/AlmaLinux 8

lib/puppet/type/xdmod_appkernel_setting.rb

@@ -52,7 +52,7 @@ def should_to_s(newvalue)
 
   autorequire(:file) do
     [
-      '/etc/xdmod/portal_settings.d/appkernels.ini'
+      '/etc/xdmod/portal_settings.d/appkernels.ini',
     ]
   end
 end

lib/puppet/type/xdmod_ondemand_setting.rb

@@ -52,7 +52,7 @@ def should_to_s(newvalue)
 
   autorequire(:file) do
     [
-      '/etc/xdmod/portal_settings.d/ondemand.ini'
+      '/etc/xdmod/portal_settings.d/ondemand.ini',
     ]
   end
 end

lib/puppet/type/xdmod_portal_setting.rb

@@ -52,7 +52,7 @@ def should_to_s(newvalue)
 
   autorequire(:file) do
     [
-      '/etc/xdmod/portal_settings.ini'
+      '/etc/xdmod/portal_settings.ini',
     ]
   end
 end

lib/puppet/type/xdmod_supremm_setting.rb

@@ -52,7 +52,7 @@ def should_to_s(newvalue)
 
   autorequire(:file) do
     [
-      '/etc/xdmod/portal_settings.d/supremm.ini'
+      '/etc/xdmod/portal_settings.d/supremm.ini',
     ]
   end
 end

metadata.json

@@ -69,16 +69,9 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7",
         "8"
       ]
     },
-    {
-      "operatingsystem": "CentOS",
-      "operatingsystemrelease": [
-        "7"
-      ]
-    },
     {
       "operatingsystem": "Rocky",
       "operatingsystemrelease": [
@@ -95,14 +88,14 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 7.0.0 < 9.0.0"
+      "version_requirement": ">= 8.0.0 < 9.0.0"
     }
   ],
   "tags": [
     "xdmod",
     "hpc"
   ],
-  "pdk-version": "2.7.1",
+  "pdk-version": "3.4.0",
   "template-url": "https://github.com/treydock/pdk-templates.git#master",
-  "template-ref": "heads/master-0-g5a59870"
+  "template-ref": "heads/master-0-g875588c"
 }

spec/acceptance/nodesets/el8.yml

@@ -1,5 +1,5 @@
 HOSTS:
-  rocky-8:
+  el8:
     roles:
       - agent
       - compute

spec/classes/xdmod_ondemand_spec.rb

@@ -6,8 +6,8 @@
   on_supported_os(supported_os: [
                     {
                       'operatingsystem' => 'RedHat',
-                      'operatingsystemrelease' => ['7', '8']
-                    }
+                      'operatingsystemrelease' => ['7', '8'],
+                    },
                   ]).each do |os, facts|
     context "when #{os}" do
       let(:facts) { facts }
@@ -31,7 +31,7 @@
               'userid' => '0001',
               'licensekey' => 'secret-key',
               'database_directory' => '/usr/share/GeoIP',
-              'productids' => ['GeoLite2-City']
+              'productids' => ['GeoLite2-City'],
             },
             update_timers: ['*-*-* 00:00:00'],
           )

spec/classes/xdmod_spec.rb

@@ -6,8 +6,8 @@
   on_supported_os(supported_os: [
                     {
                       'operatingsystem' => 'RedHat',
-                      'operatingsystemrelease' => ['7', '8']
-                    }
+                      'operatingsystemrelease' => ['7', '8'],
+                    },
                   ]).each do |os, facts|
     context "when #{os}" do
       let(:facts) { facts }
@@ -109,9 +109,9 @@
               'resource_id' => 1,
               'enabled' => true,
               'datasetmap' => 'pcp',
-              'pcp_log_dir' => '/data/pcp-data/example'
+              'pcp_log_dir' => '/data/pcp-data/example',
             }],
-            pcp_resource: 'example'
+            pcp_resource: 'example',
           }
         end
         let(:params) { default_params }
@@ -129,12 +129,12 @@
                                                                  socks: 'false',
                                                                  log_dir: '/data/pcp-data/example/LOCALHOSTNAME',
                                                                  args: '-r',
-                                                                 config_path: '/etc/pcp/pmlogger/pmlogger-supremm.config')
+                                                                 config_path: '/etc/pcp/pmlogger/pmlogger-supremm.config',)
           end
 
           it do
             is_expected.to contain_pcp__pmda('proc').with(has_package: 'false',
-                                                          config_path: '/var/lib/pcp/pmdas/proc/hotproc.conf')
+                                                          config_path: '/var/lib/pcp/pmdas/proc/hotproc.conf',)
           end
 
           it do
@@ -156,7 +156,7 @@
             {
               web: false,
               database: false,
-              compute: true
+              compute: true,
             }
           end