diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 063e573..8a099dd 100644 --- a/.github/workflows/ci.yaml +++ b/.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: diff --git a/.rubocop.yml b/.rubocop.yml index 4d078c7..d91527c 100644 --- a/.rubocop.yml +++ b/.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 diff --git a/.sync.yml b/.sync.yml index cacbc8c..561066c 100644 --- a/.sync.yml +++ b/.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'" diff --git a/Gemfile b/Gemfile index 300688d..024eb5c 100644 --- a/Gemfile +++ b/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 diff --git a/README.md b/README.md index c9795aa..95c2d08 100644 --- a/README.md +++ b/README.md @@ -251,5 +251,4 @@ xdmod::supremm_database: true This module has been tested on: -* RedHat/CentOS 7 * RedHat/Rocky/AlmaLinux 8 diff --git a/lib/puppet/type/xdmod_appkernel_setting.rb b/lib/puppet/type/xdmod_appkernel_setting.rb index 8b5f230..f1e6bda 100644 --- a/lib/puppet/type/xdmod_appkernel_setting.rb +++ b/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 diff --git a/lib/puppet/type/xdmod_ondemand_setting.rb b/lib/puppet/type/xdmod_ondemand_setting.rb index 74a5c63..7d9d390 100644 --- a/lib/puppet/type/xdmod_ondemand_setting.rb +++ b/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 diff --git a/lib/puppet/type/xdmod_portal_setting.rb b/lib/puppet/type/xdmod_portal_setting.rb index 501430a..1572b53 100644 --- a/lib/puppet/type/xdmod_portal_setting.rb +++ b/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 diff --git a/lib/puppet/type/xdmod_supremm_setting.rb b/lib/puppet/type/xdmod_supremm_setting.rb index f9d280b..4f0321c 100644 --- a/lib/puppet/type/xdmod_supremm_setting.rb +++ b/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 diff --git a/metadata.json b/metadata.json index f7d1b0c..87e33e0 100644 --- a/metadata.json +++ b/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" } diff --git a/spec/acceptance/nodesets/el7.yml b/spec/acceptance/nodesets/el7.yml deleted file mode 100644 index f74dad0..0000000 --- a/spec/acceptance/nodesets/el7.yml +++ /dev/null @@ -1,31 +0,0 @@ -HOSTS: - centos-7: - roles: - - agent - - compute - - db - - akrr - - supremm - - web - platform: el-7-x86_64 - hypervisor: docker - image: centos:7 - docker_preserve_image: true - docker_cmd: - - '/usr/sbin/init' - docker_image_commands: - - 'yum install -y wget which cronie iproute initscripts' - - 'wget --no-check-certificate https://copr.fedorainfracloud.org/coprs/jsynacek/systemd-backports-for-centos-7/repo/epel-7/jsynacek-systemd-backports-for-centos-7-epel-7.repo -O /etc/yum.repos.d/jsynacek-systemd-centos-7.repo' - - 'yum update -y systemd' - docker_env: - - LANG=en_US.UTF-8 - - LANGUAGE=en_US.UTF-8 - - LC_ALL=en_US.UTF-8 - docker_container_name: 'xdmod-el7' -CONFIG: - log_level: debug - type: foss -ssh: - password: root - auth_methods: ["password"] - diff --git a/spec/acceptance/nodesets/el8.yml b/spec/acceptance/nodesets/el8.yml index e721bfb..3e32401 100644 --- a/spec/acceptance/nodesets/el8.yml +++ b/spec/acceptance/nodesets/el8.yml @@ -1,5 +1,5 @@ HOSTS: - rocky-8: + el8: roles: - agent - compute diff --git a/spec/classes/xdmod_ondemand_spec.rb b/spec/classes/xdmod_ondemand_spec.rb index 9335323..8e416d8 100644 --- a/spec/classes/xdmod_ondemand_spec.rb +++ b/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'], ) diff --git a/spec/classes/xdmod_spec.rb b/spec/classes/xdmod_spec.rb index 6cc8cac..6075bf0 100644 --- a/spec/classes/xdmod_spec.rb +++ b/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 diff --git a/spec/shared_examples/config.rb b/spec/shared_examples/config.rb index 285b45e..ba9ad67 100644 --- a/spec/shared_examples/config.rb +++ b/spec/shared_examples/config.rb @@ -6,7 +6,7 @@ 'database', 'datawarehouse', 'shredder', - 'hpcdb' + 'hpcdb', ].each do |section| it do is_expected.to contain_xdmod_portal_setting("#{section}/host").with(value: '127.0.0.1', @@ -16,8 +16,8 @@ 'File[/etc/xdmod/names.csv]', 'Exec[etl-bootstrap]', 'Exec[etl-bootstrap-supremm]', - 'Exec[acl-config]' - ]) + 'Exec[acl-config]', + ],) end it do @@ -28,8 +28,8 @@ 'File[/etc/xdmod/names.csv]', 'Exec[etl-bootstrap]', 'Exec[etl-bootstrap-supremm]', - 'Exec[acl-config]' - ]) + 'Exec[acl-config]', + ],) end it do @@ -40,8 +40,8 @@ 'File[/etc/xdmod/names.csv]', 'Exec[etl-bootstrap]', 'Exec[etl-bootstrap-supremm]', - 'Exec[acl-config]' - ]) + 'Exec[acl-config]', + ],) end it do @@ -53,8 +53,8 @@ 'File[/etc/xdmod/names.csv]', 'Exec[etl-bootstrap]', 'Exec[etl-bootstrap-supremm]', - 'Exec[acl-config]' - ]) + 'Exec[acl-config]', + ],) end end @@ -80,14 +80,14 @@ is_expected.to contain_file('/etc/xdmod/portal_settings.ini').with(ensure: 'file', owner: 'apache', group: 'xdmod', - mode: '0440') + mode: '0440',) end it do is_expected.to contain_file('/etc/xdmod/hierarchy.json').with(ensure: 'file', owner: 'root', group: 'root', - mode: '0644') + mode: '0644',) end it { is_expected.to contain_file_line('etl_overseer-db-log') } @@ -95,7 +95,7 @@ it do expected_cmd = [ '/usr/share/xdmod/tools/etl/etl_overseer.php', - '-p supremm.bootstrap', '-p jobefficiency.bootstrap' + '-p supremm.bootstrap', '-p jobefficiency.bootstrap', ] is_expected.to contain_exec('etl-bootstrap-supremm').with( path: '/usr/bin:/bin:/usr/sbin:/sbin', @@ -111,7 +111,7 @@ '/usr/share/xdmod/tools/etl/etl_overseer.php', '-p xdb-bootstrap', '-p jobs-xdw-bootstrap', '-p xdw-bootstrap-storage', '-p shredder-bootstrap', '-p staging-bootstrap', '-p hpcdb-bootstrap', - '-p acls-xdmod-management', '-p logger-bootstrap' + '-p acls-xdmod-management', '-p logger-bootstrap', ] is_expected.to contain_exec('etl-bootstrap').with( path: '/usr/bin:/bin:/usr/sbin:/sbin', @@ -140,8 +140,8 @@ ' "middle_level_info": "",', ' "bottom_level_label": "Hierarchy Bottom Level",', ' "bottom_level_info": ""', - '}' - ]) + '}', + ],) end it do @@ -149,7 +149,7 @@ owner: 'xdmod', group: 'root', mode: '0644', - content: nil) + content: nil,) end it do @@ -161,7 +161,7 @@ owner: 'xdmod', group: 'root', mode: '0644', - content: nil) + content: nil,) end it do @@ -173,7 +173,7 @@ owner: 'xdmod', group: 'root', mode: '0644', - content: nil) + content: nil,) end it do @@ -196,7 +196,7 @@ rotate_every: 'week', missingok: 'true', compress: 'true', - dateext: 'true') + dateext: 'true',) end it do @@ -212,7 +212,7 @@ rotate_every: 'week', missingok: 'true', compress: 'true', - dateext: 'true') + dateext: 'true',) end context 'when php_timezone defined' do @@ -231,8 +231,8 @@ let(:params) do { resources: [ - { 'resource' => 'example', 'name' => 'Example' } - ] + { 'resource' => 'example', 'name' => 'Example' }, + ], } end @@ -243,7 +243,7 @@ 'resource' => 'example', 'resource_type' => 'HPC', 'name' => 'Example', - 'pi_column' => 'account_name' + 'pi_column' => 'account_name', }] expect(value).to eq(expected) end @@ -254,8 +254,8 @@ { resources: [ { 'resource' => 'example1', 'name' => 'Example1' }, - { 'resource' => 'example2', 'name' => 'Example2' } - ] + { 'resource' => 'example2', 'name' => 'Example2' }, + ], } end @@ -267,14 +267,14 @@ 'resource' => 'example1', 'resource_type' => 'HPC', 'name' => 'Example1', - 'pi_column' => 'account_name' + 'pi_column' => 'account_name', }, { 'resource' => 'example2', 'resource_type' => 'HPC', 'name' => 'Example2', - 'pi_column' => 'account_name' - } + 'pi_column' => 'account_name', + }, ] expect(value).to eq(expected) end @@ -284,8 +284,8 @@ let(:params) do { resource_specs: [ - { 'resource' => 'example', 'processors' => 2, 'nodes' => 1, 'ppn' => 2 } - ] + { 'resource' => 'example', 'processors' => 2, 'nodes' => 1, 'ppn' => 2 }, + ], } end @@ -296,7 +296,7 @@ 'resource' => 'example', 'processors' => 2, 'nodes' => 1, - 'ppn' => 2 + 'ppn' => 2, ] expect(value).to eq(expected) end @@ -311,7 +311,7 @@ is_expected.to contain_file('/etc/xdmod/portal_settings.d/appkernels.ini').with(ensure: 'file', owner: 'xdmod', group: 'apache', - mode: '0640') + mode: '0640',) end it { is_expected.to contain_xdmod_appkernel_setting('features/appkernels').with_value('on') } @@ -332,7 +332,7 @@ is_expected.to contain_file('/etc/cron.d/xdmod-appkernels').with(ensure: 'file', owner: 'root', group: 'root', - mode: '0644') + mode: '0644',) end end @@ -340,7 +340,7 @@ let(:params) do { enable_supremm: true, - supremm_resources: [{ 'resource' => 'example', 'resource_id' => 1, 'pcp_log_dir' => '/dne' }] + supremm_resources: [{ 'resource' => 'example', 'resource_id' => 1, 'pcp_log_dir' => '/dne' }], } end @@ -357,8 +357,8 @@ 'resource_id' => 1, 'enabled' => true, 'datasetmap' => 'pcp', - 'hardware' => { 'gpfs' => '' } - ] + 'hardware' => { 'gpfs' => '' }, + ], } expect(value).to eq(expected) end @@ -369,8 +369,8 @@ enable_supremm: true, supremm_resources: [ { 'resource' => 'example', 'resource_id' => 1, 'pcp_log_dir' => '/dne', 'datasetmap_source' => 'puppet:///modules/site/pcp-test.js' }, - { 'resource' => 'foo', 'resource_id' => 2, 'pcp_log_dir' => '/dne', 'datasetmap_source' => 'puppet:///modules/site/pcp-test.js' } - ] + { 'resource' => 'foo', 'resource_id' => 2, 'pcp_log_dir' => '/dne', 'datasetmap_source' => 'puppet:///modules/site/pcp-test.js' }, + ], } end @@ -394,16 +394,16 @@ 'resource_id' => 1, 'enabled' => true, 'datasetmap' => 'pcp-test', - 'hardware' => { 'gpfs' => '' } + 'hardware' => { 'gpfs' => '' }, }, { 'resource' => 'foo', 'resource_id' => 2, 'enabled' => true, 'datasetmap' => 'pcp-test', - 'hardware' => { 'gpfs' => '' } - } - ] + 'hardware' => { 'gpfs' => '' }, + }, + ], } expect(value).to eq(expected) end @@ -413,7 +413,7 @@ let(:params) do { enable_supremm: true, - supremm_resources: [{ 'resource' => 'example', 'resource_id' => 1, 'collection' => 'resource_1', 'pcp_log_dir' => '/dne' }] + supremm_resources: [{ 'resource' => 'example', 'resource_id' => 1, 'collection' => 'resource_1', 'pcp_log_dir' => '/dne' }], } end @@ -427,8 +427,8 @@ 'collection' => 'resource_1', 'enabled' => true, 'datasetmap' => 'pcp', - 'hardware' => { 'gpfs' => '' } - ] + 'hardware' => { 'gpfs' => '' }, + ], } expect(value).to eq(expected) end @@ -440,8 +440,8 @@ { hierarchy_levels: { 'top' => { 'label' => 'Top', 'info' => 'Top' }, - 'middle' => { 'label' => 'Middle', 'info' => 'Middle' } - } + 'middle' => { 'label' => 'Middle', 'info' => 'Middle' }, + }, } end @@ -454,8 +454,8 @@ ' "middle_level_info": "Middle",', ' "bottom_level_label": "Hierarchy Bottom Level",', ' "bottom_level_info": ""', - '}' - ]) + '}', + ],) end end @@ -468,8 +468,8 @@ 'div1,Division 1,ou1', '"div2","Division 2","ou2"', 'dept1,Department 1,div1', - '"dept2","Department 2","div2"' - ] + '"dept2","Department 2","div2"', + ], } end @@ -480,15 +480,15 @@ '"div1","Division 1","ou1"', '"div2","Division 2","ou2"', '"dept1","Department 1","div1"', - '"dept2","Department 2","div2"' - ]) + '"dept2","Department 2","div2"', + ],) end it do is_expected.to contain_exec('xdmod-import-csv-hierarchy').with(path: '/sbin:/bin:/usr/sbin:/usr/bin', command: 'xdmod-import-csv -t hierarchy -i /etc/xdmod/hierarchy.csv', refreshonly: 'true', - subscribe: 'File[/etc/xdmod/hierarchy.csv]') + subscribe: 'File[/etc/xdmod/hierarchy.csv]',) end context 'when group_to_hierarchy defined' do @@ -500,13 +500,13 @@ 'div1,Division 1,ou1', '"div2","Division 2","ou2"', 'dept1,Department 1,div1', - '"dept2","Department 2","div2"' + '"dept2","Department 2","div2"', ], group_to_hierarchy: { 'group1' => 'dept1', 'group2' => 'dept1', - 'group3' => 'dept2' - } + 'group3' => 'dept2', + }, } end @@ -520,8 +520,8 @@ group_to_hierarchy: { 'group1' => 'dept1', 'group2' => 'dept1', - 'group3' => 'dept2' - } + 'group3' => 'dept2', + }, } end @@ -529,15 +529,15 @@ verify_exact_contents(catalogue, '/etc/xdmod/group-to-hierarchy.csv', [ '"group1","dept1"', '"group2","dept1"', - '"group3","dept2"' - ]) + '"group3","dept2"', + ],) end it do is_expected.to contain_exec('xdmod-import-csv-group-to-hierarchy').with(path: '/sbin:/bin:/usr/sbin:/usr/bin', command: 'xdmod-import-csv -t group-to-hierarchy -i /etc/xdmod/group-to-hierarchy.csv', refreshonly: 'true', - subscribe: 'File[/etc/xdmod/group-to-hierarchy.csv]') + subscribe: 'File[/etc/xdmod/group-to-hierarchy.csv]',) end end @@ -546,23 +546,23 @@ { user_pi_names: [ 'jdoe,John,Doe', - 'mygroup,,"My Group"' - ] + 'mygroup,,"My Group"', + ], } end it do verify_exact_contents(catalogue, '/etc/xdmod/names.csv', [ 'jdoe,John,Doe', - 'mygroup,,"My Group"' - ]) + 'mygroup,,"My Group"', + ],) end it do is_expected.to contain_exec('xdmod-import-csv-names').with(path: '/sbin:/bin:/usr/sbin:/usr/bin', command: 'xdmod-import-csv -t names -i /etc/xdmod/names.csv', refreshonly: 'true', - subscribe: 'File[/etc/xdmod/names.csv]') + subscribe: 'File[/etc/xdmod/names.csv]',) end end @@ -570,8 +570,8 @@ let(:params) do { resources: [ - { resource: 'home', name: 'Home', resource_type: 'Disk', shred_directory: '/shared/quotas/home' } - ] + { resource: 'home', name: 'Home', resource_type: 'Disk', shred_directory: '/shared/quotas/home' }, + ], } end @@ -580,8 +580,8 @@ it 'has storage ingest contents' do verify_contents(catalogue, '/usr/local/bin/xdmod-storage-ingest.sh', [ - ' xdmod-shredder -f storage -r home -d /shared/quotas/home' - ]) + ' xdmod-shredder -f storage -r home -d /shared/quotas/home', + ],) end end @@ -589,11 +589,11 @@ let(:params) do { resources: [ - { 'resource' => 'ondemand', 'name' => 'OnDemand', 'resource_type' => 'Gateway' } + { 'resource' => 'ondemand', 'name' => 'OnDemand', 'resource_type' => 'Gateway' }, ], resource_specs: [ - { 'resource' => 'example', 'processors' => 2, 'nodes' => 1, 'ppn' => 2 } - ] + { 'resource' => 'example', 'processors' => 2, 'nodes' => 1, 'ppn' => 2 }, + ], } end @@ -603,7 +603,7 @@ expected = [{ 'resource' => 'ondemand', 'resource_type' => 'Gateway', - 'name' => 'OnDemand' + 'name' => 'OnDemand', }] expect(value).to eq(expected) end @@ -615,14 +615,14 @@ 'resource' => 'example', 'processors' => 2, 'nodes' => 1, - 'ppn' => 2 + 'ppn' => 2, }, { 'resource' => 'ondemand', 'processors' => 1, 'nodes' => 1, - 'ppn' => 1 - }] + 'ppn' => 1, + },] expect(value).to eq(expected) end end diff --git a/spec/shared_examples/config_simplesamlphp.rb b/spec/shared_examples/config_simplesamlphp.rb index d3da7fe..b6263a0 100644 --- a/spec/shared_examples/config_simplesamlphp.rb +++ b/spec/shared_examples/config_simplesamlphp.rb @@ -5,7 +5,7 @@ '/etc/xdmod/simplesamlphp', '/etc/xdmod/simplesamlphp/config', '/etc/xdmod/simplesamlphp/metadata', - '/etc/xdmod/simplesamlphp/cert' + '/etc/xdmod/simplesamlphp/cert', ] dirs.each do |dir| diff --git a/spec/shared_examples/cron.rb b/spec/shared_examples/cron.rb index 12d75ae..73d52e7 100644 --- a/spec/shared_examples/cron.rb +++ b/spec/shared_examples/cron.rb @@ -29,8 +29,8 @@ it do verify_contents(catalogue, '/etc/cron.d/xdmod', [ - '1 0 * * * xdmod /usr/local/bin/xdmod-cron.sh' - ]) + '1 0 * * * xdmod /usr/local/bin/xdmod-cron.sh', + ],) end it { is_expected.to contain_file('/etc/cron.d/xdmod-storage').with_ensure('absent') } @@ -41,16 +41,16 @@ let(:params) do { resources: [ - { 'resource' => 'example', 'name' => 'Example' } - ] + { 'resource' => 'example', 'name' => 'Example' }, + ], } end it do verify_contents(catalogue, '/usr/local/bin/xdmod-cron.sh', [ '/usr/bin/xdmod-slurm-helper --quiet -r example', - '/usr/bin/xdmod-ingestor --quiet 2>&1 | logger -t xdmod-ingestor' - ]) + '/usr/bin/xdmod-ingestor --quiet 2>&1 | logger -t xdmod-ingestor', + ],) end end @@ -59,8 +59,8 @@ { resources: [ { 'resource' => 'example1', 'name' => 'Example1' }, - { 'resource' => 'example2', 'name' => 'Example2' } - ] + { 'resource' => 'example2', 'name' => 'Example2' }, + ], } end @@ -68,23 +68,23 @@ verify_contents(catalogue, '/usr/local/bin/xdmod-cron.sh', [ '/usr/bin/xdmod-slurm-helper --quiet -r example1', '/usr/bin/xdmod-slurm-helper --quiet -r example2', - '/usr/bin/xdmod-ingestor --quiet 2>&1 | logger -t xdmod-ingestor' - ]) + '/usr/bin/xdmod-ingestor --quiet 2>&1 | logger -t xdmod-ingestor', + ],) end end context 'when shredder_command defined as String' do let(:params) do { - shredder_command: '/usr/bin/xdmod-slurm-helper --quiet -r example' + shredder_command: '/usr/bin/xdmod-slurm-helper --quiet -r example', } end it do verify_contents(catalogue, '/usr/local/bin/xdmod-cron.sh', [ '/usr/bin/xdmod-slurm-helper --quiet -r example', - '/usr/bin/xdmod-ingestor --quiet 2>&1 | logger -t xdmod-ingestor' - ]) + '/usr/bin/xdmod-ingestor --quiet 2>&1 | logger -t xdmod-ingestor', + ],) end end @@ -93,8 +93,8 @@ { shredder_command: [ '/usr/bin/xdmod-slurm-helper --quiet -r example1', - '/usr/bin/xdmod-slurm-helper --quiet -r example2' - ] + '/usr/bin/xdmod-slurm-helper --quiet -r example2', + ], } end @@ -102,15 +102,15 @@ verify_contents(catalogue, '/usr/local/bin/xdmod-cron.sh', [ '/usr/bin/xdmod-slurm-helper --quiet -r example1', '/usr/bin/xdmod-slurm-helper --quiet -r example2', - '/usr/bin/xdmod-ingestor --quiet 2>&1 | logger -t xdmod-ingestor' - ]) + '/usr/bin/xdmod-ingestor --quiet 2>&1 | logger -t xdmod-ingestor', + ],) end end context 'when supremm enabled' do let(:params) do { - supremm: true + supremm: true, } end @@ -122,7 +122,7 @@ let(:params) do { supremm: true, - supremm_cron_index_archives: false + supremm_cron_index_archives: false, } end @@ -135,7 +135,7 @@ context 'when enable_ondemand => true' do let(:params) do { - enable_ondemand: true + enable_ondemand: true, } end diff --git a/spec/shared_examples/database.rb b/spec/shared_examples/database.rb index a7f8dd1..99a26cd 100644 --- a/spec/shared_examples/database.rb +++ b/spec/shared_examples/database.rb @@ -7,7 +7,7 @@ 'mod_shredder', 'moddb', 'modw', - 'modw_aggregates' + 'modw_aggregates', ].each do |db| it "creates Mysql::Db[#{db}]" do is_expected.to contain_mysql__db(db).with(ensure: 'present', @@ -16,7 +16,7 @@ host: 'localhost', charset: 'latin1', collate: 'latin1_swedish_ci', - grant: ['ALL']) + grant: ['ALL'],) end end @@ -67,7 +67,7 @@ host: 'localhost', charset: 'latin1', collate: 'latin1_swedish_ci', - grant: ['ALL']) + grant: ['ALL'],) end it do @@ -77,7 +77,7 @@ host: 'localhost', charset: 'latin1', collate: 'latin1_swedish_ci', - grant: ['ALL']) + grant: ['ALL'],) end it do @@ -88,7 +88,7 @@ host: 'localhost', charset: 'latin1', collate: 'latin1_swedish_ci', - grant: ['SELECT']) + grant: ['SELECT'],) end context 'when akrr_host != web_host' do diff --git a/spec/shared_examples/install.rb b/spec/shared_examples/install.rb index b6f2358..6cb59a5 100644 --- a/spec/shared_examples/install.rb +++ b/spec/shared_examples/install.rb @@ -49,7 +49,7 @@ is_expected.to contain_package('xdmod').only_with(ensure: 'present', name: 'xdmod', require: ['Yumrepo[local]', 'Yumrepo[epel]'], - notify: 'Exec[etl-bootstrap]') + notify: 'Exec[etl-bootstrap]',) end it { is_expected.not_to contain_package('xdmod-appkernels') } @@ -60,7 +60,7 @@ it do is_expected.to contain_package('xdmod-appkernels').only_with(ensure: 'present', name: 'xdmod-appkernels', - require: ['Yumrepo[local]', 'Yumrepo[epel]']) + require: ['Yumrepo[local]', 'Yumrepo[epel]'],) end end @@ -71,7 +71,7 @@ is_expected.to contain_package('xdmod-supremm').only_with(ensure: 'present', name: 'xdmod-supremm', require: ['Yumrepo[local]', 'Yumrepo[epel]'], - notify: 'Exec[etl-bootstrap-supremm]') + notify: 'Exec[etl-bootstrap-supremm]',) end end end diff --git a/spec/shared_examples/supremm_compute_pcp.rb b/spec/shared_examples/supremm_compute_pcp.rb index 25f473a..d05732a 100644 --- a/spec/shared_examples/supremm_compute_pcp.rb +++ b/spec/shared_examples/supremm_compute_pcp.rb @@ -8,12 +8,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 diff --git a/spec/shared_examples/supremm_config.rb b/spec/shared_examples/supremm_config.rb index b12b8c0..984377c 100644 --- a/spec/shared_examples/supremm_config.rb +++ b/spec/shared_examples/supremm_config.rb @@ -18,8 +18,8 @@ datasource: 'prometheus', hardware: { gpfs: 'ess', network: 'em1' }, batchscript: { path: '/scripts', timestamp_mode: 'start' }, - prom_host: 'foo.example.com:9090' - } + prom_host: 'foo.example.com:9090', + }, ], ) end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 7272754..c854cc5 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -13,12 +13,12 @@ default_facts = { puppetversion: Puppet.version, - facterversion: Facter.version + facterversion: Facter.version, } default_fact_files = [ File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml')), - File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml')) + File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml')), ] default_fact_files.each do |f| diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 09cf9fa..be13d86 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -9,8 +9,8 @@ Dir["#{dir}/acceptance/shared_examples/**/*.rb"].sort.each { |f| require f } require 'spec_helper_acceptance_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_acceptance_local.rb')) -run_puppet_install_helper unless ENV['BEAKER_set'] == 'debian-12' -on hosts, 'apt install -y puppet-agent' if ENV['BEAKER_set'] == 'debian-12' +run_puppet_install_helper unless ['debian-12', 'ubuntu-2404'].include?(ENV['BEAKER_set']) +on hosts, 'apt install -y puppet-agent' if ['debian-12', 'ubuntu-2404'].include?(ENV['BEAKER_set']) install_module_on(hosts) install_module_dependencies_on(hosts) diff --git a/spec/spec_helper_acceptance_full.rb b/spec/spec_helper_acceptance_full.rb index d6c67ad..44c69d3 100644 --- a/spec/spec_helper_acceptance_full.rb +++ b/spec/spec_helper_acceptance_full.rb @@ -10,15 +10,12 @@ run_puppet_install_helper install_module_on(hosts) install_module_dependencies_on(hosts) -collection = ENV['BEAKER_PUPPET_COLLECTION'] || 'puppet5' RSpec.configure do |c| # Readable test descriptions c.formatter = :documentation - if collection == 'puppet6' - on hosts, puppet('module', 'install', 'puppetlabs-yumrepo_core', '--version', '">= 1.0.1 < 2.0.0"'), acceptable_exit_codes: [0, 1] - on hosts, puppet('module', 'install', 'puppetlabs-cron_core', '--version', '">= 1.0.0 < 2.0.0"'), acceptable_exit_codes: [0, 1] - end + on hosts, puppet('module', 'install', 'puppetlabs-yumrepo_core', '--version', '">= 1.0.1 < 2.0.0"'), acceptable_exit_codes: [0, 1] + on hosts, puppet('module', 'install', 'puppetlabs-cron_core', '--version', '">= 1.0.0 < 2.0.0"'), acceptable_exit_codes: [0, 1] end on hosts, 'puppet config set --section main show_diff true' diff --git a/spec/spec_helper_acceptance_setup.rb b/spec/spec_helper_acceptance_setup.rb index 491e6ab..3a86af8 100644 --- a/spec/spec_helper_acceptance_setup.rb +++ b/spec/spec_helper_acceptance_setup.rb @@ -1,12 +1,7 @@ # frozen_string_literal: true -collection = ENV['BEAKER_PUPPET_COLLECTION'] || 'puppet5' RSpec.configure do |c| c.before :suite do - if collection == 'puppet6' - on hosts, puppet('module', 'install', 'puppetlabs-yumrepo_core', '--version', '">= 1.0.1 < 2.0.0"'), acceptable_exit_codes: [0, 1] - on hosts, puppet('module', 'install', 'puppetlabs-cron_core', '--version', '">= 1.0.0 < 2.0.0"'), acceptable_exit_codes: [0, 1] - end on hosts, 'puppet module install trepasi-geoip --ignore-dependencies' on hosts, 'puppet config set --section main show_diff true' on hosts, 'mkdir -p /etc/puppetlabs/facter/facts.d' diff --git a/spec/spec_helper_local.rb b/spec/spec_helper_local.rb index b433f8e..77f83ae 100644 --- a/spec/spec_helper_local.rb +++ b/spec/spec_helper_local.rb @@ -13,8 +13,6 @@ def verify_exact_contents(subject, title, expected_lines) add_custom_fact :systemd_version, ->(os, _facts) { case os - when %r{(redhat|centos|scientific)-7-x86_64} - 219 when %r{(redhat|centos|scientific)-8-x86_64} 239 end