Support RHEL, Alma, Rocky 8,9, Debian 11, 12 and Ubuntu 20.04 and 22.04

.github/workflows/ci.yml

@@ -18,4 +18,8 @@ concurrency:
 jobs:
  puppet:
  name: Puppet
- uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
+ uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3
+ with:
+ pidfile_workaround: 'false'
+ beaker_facter: 'memory.system.total:TotalMemory:100 MiB'
+ beaker_hypervisor: 'vagrant_libvirt'

.sync.yml

@@ -2,3 +2,11 @@
 spec/spec_helper.rb:
  hiera_config: "'spec/fixtures/hiera/hiera.yaml'"
  mock_with: ':mocha'
+
+spec/spec_helper_acceptance.rb:
+ unmanaged: false
+
+# Minimum size that mkswap will accept is 40MB.
+.github/workflows/ci.yml:
+ beaker_hypervisor: vagrant_libvirt
+ beaker_facter: 'memory.system.total:TotalMemory:100 MiB'

metadata.json

@@ -11,23 +11,36 @@
  {
  "operatingsystem": "RedHat",
  "operatingsystemrelease": [
- "5",
- "6",
- "7"
+ "8",
+ "9"
+ ]
+ },
+ {
+ "operatingsystem": "AlmaLinux",
+ "operatingsystemrelease": [
+ "8",
+ "9"
+ ]
+ },
+ {
+ "operatingsystem": "Rocky",
+ "operatingsystemrelease": [
+ "8",
+ "9"
  ]
  },
  {
  "operatingsystem": "Debian",
  "operatingsystemrelease": [
- "6",
- "7"
+ "11",
+ "12"
  ]
  },
  {
  "operatingsystem": "Ubuntu",
  "operatingsystemrelease": [
- "12.04",
- "14.04"
+ "20.04",
+ "22.04"
  ]
  }
  ],

spec/acceptance/swap_file_class_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper_acceptance'
 
-describe 'swap_file class', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'swap_file class' do
  context 'swap_file' do
  context 'ensure => present' do
  it 'works with no errors' do

spec/acceptance/swap_file_files_fallocate_command.rb

@@ -2,8 +2,8 @@
 
 require 'spec_helper_acceptance'
 
-describe 'swap_file::files defined type', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
- context 'fallocate command', unless: ['FreeBSD'].include?(fact('osfamily')) do
+describe 'swap_file::files defined type' do
+ context 'fallocate command', unless: ['FreeBSD'].include?(fact('os.family')) do
  it 'works with no errors' do
  pp = <<-EOS
  swap_file::files { 'default':

spec/acceptance/swap_file_files_multiple_spec.rb

@@ -2,8 +2,8 @@
 
 require 'spec_helper_acceptance'
 
-describe 'swap_file::files defined type', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
- context 'multiple swap_file::files', unless: ['FreeBSD'].include?(fact('osfamily')) do
+describe 'swap_file::files defined type' do
+ context 'multiple swap_file::files', unless: ['FreeBSD'].include?(fact('os.family')) do
  it 'works with no errors' do
  pp = <<-EOS
  swap_file::files { 'tmp file swap 1':

spec/acceptance/swap_file_files_parameters_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper_acceptance'
 
-describe 'swap_file::files defined type', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'swap_file::files defined type' do
  context 'swap_file' do
  context 'custom parameters' do
  it 'works with no errors' do
@@ -18,7 +18,7 @@
  end
 
  it 'contains the given swapfile' do
- if ['FreeBSD'].include?(fact('osfamily'))
+ if ['FreeBSD'].include?(fact('os.family'))
  shell('/usr/sbin/swapinfo | grep /dev/md99', acceptable_exit_codes: [0])
  else
  shell('/sbin/swapon -s | grep /tmp/swapfile', acceptable_exit_codes: [0])
@@ -27,7 +27,7 @@
 
  it 'contains the given fstab setting' do
  shell('cat /etc/fstab | grep /tmp/swapfile', acceptable_exit_codes: [0])
- if ['FreeBSD'].include?(fact('osfamily'))
+ if ['FreeBSD'].include?(fact('os.family'))
  shell('cat /etc/fstab | grep md99', acceptable_exit_codes: [0])
  else
  shell('cat /etc/fstab | grep defaults', acceptable_exit_codes: [0])

spec/acceptance/swap_file_files_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper_acceptance'
 
-describe 'swap_file::files defined type', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'swap_file::files defined type' do
  context 'swap_file' do
  context 'ensure => present' do
  it 'works with no errors' do

spec/acceptance/swap_file_resizing_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper_acceptance'
 
-describe 'swap_file class', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'swap_file class' do
  context 'swap_file' do
  context 'swapfilesize => 100' do
  it 'works with no errors' do

spec/acceptance/swap_file_resizing_stringify_true_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper_acceptance'
 
-describe 'swap_file class', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'swap_file class' do
  context 'swap_file' do
  context 'swapfilesize => 100' do
  it 'works with no errors' do

spec/acceptance/swap_file_swappiness_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper_acceptance'
 
-describe 'swap_file::swappiness class', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+describe 'swap_file::swappiness class' do
  context 'swap_file::swappiness' do
  context 'swappiness => 75, permanent => false' do
  it 'works with no errors' do

spec/spec_helper_acceptance.rb

@@ -1,35 +1,10 @@
 # frozen_string_literal: true
 
-require 'beaker-rspec'
+# Managed by modulesync - DO NOT EDIT
+# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
 
-unless ENV['RS_PROVISION'] == 'no'
- hosts.each do |host|
- if host.is_pe?
- install_pe
- else
- install_puppet
- on host, "mkdir -p #{host['distmoduledir']}"
- end
- end
-end
+require 'voxpupuli/acceptance/spec_helper_acceptance'
 
-UNSUPPORTED_PLATFORMS = ['windows'].freeze
+configure_beaker(modules: :metadata)
 
-RSpec.configure do |c|
- # Project root
- proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-
- # Readable test descriptions
- c.formatter = :documentation
-
- # Configure all nodes in nodeset
- c.before :suite do
- # Install module and dependencies
- puppet_module_install(source: proj_root, module_name: 'swap_file')
- hosts.each do |_host|
- shell('puppet module install puppetlabs-stdlib --version 4.7.0', { acceptable_exit_codes: [0] })
- shell('puppet module install herculesteam/augeasproviders_core --version 2.1.0', { acceptable_exit_codes: [0] })
- shell('puppet module install herculesteam/augeasproviders_sysctl --version 2.1.0', { acceptable_exit_codes: [0] })
- end
- end
-end
+Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }