Update gems to support testing Puppet 8

.github/workflows/ci.yml

@@ -3,8 +3,6 @@ name: CI
 
 on:
   pull_request:
-  schedule:
-    - cron: '4 4 * * *'
 
 
 concurrency:
@@ -14,7 +12,7 @@ concurrency:
 jobs:
   puppet:
     name: Puppet
-    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
+    uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
     with:
       pidfile_workaround: 'true'
       rubocop: false

.gitignore

@@ -29,7 +29,8 @@ vendor/
 .ruby-*
 
 ## rspec
-spec/fixtures/
+spec/fixtures/manifests
+spec/fixtures/modules
 junit/
 
 ## Puppet module

CONTRIBUTING.md

@@ -194,7 +194,7 @@ More filter info available [here](https://relishapp.com/rspec/rspec-core/v/3-9/d
 To run OS specific tests:
 
 ```shell
-SPEC_FACTS_OS=redhat-7-x86_64 bundle exec rspec spec/classes/foreman_spec.rb
+SPEC_FACTS_OS=redhat-8-x86_64 bundle exec rspec spec/classes/foreman_spec.rb
 ```
 
 If you have more than one version of `redhat` OS specified in metadata.json,

Gemfile

@@ -3,25 +3,17 @@
 
 source 'https://rubygems.org'
 
-gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '>= 5.5', groups: ['development', 'test']
+gem 'puppet', ENV.fetch('PUPPET_GEM_VERSION', '>= 7'), groups: ['development', 'test']
 gem 'rake'
 
 gem 'kafo_module_lint', {"groups"=>["test"]}
-gem 'puppet-lint-empty_string-check', {"groups"=>["test"]}
-gem 'puppet-lint-file_ensure-check', {"groups"=>["test"]}
-gem 'puppet-lint-param-docs', '>= 1.3.0', {"groups"=>["test"]}
-gem 'puppet-lint-spaceship_operator_without_tag-check', {"groups"=>["test"]}
-gem 'puppet-lint-strict_indent-check', {"groups"=>["test"]}
-gem 'puppet-lint-undef_in_function-check', {"groups"=>["test"]}
-gem 'voxpupuli-test', '~> 5.0', {"groups"=>["test"]}
+gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 1.0', {"groups"=>["test"]}
+gem 'voxpupuli-test', '~> 7.0', {"groups"=>["test"]}
 gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
-gem 'puppet_metadata', '~> 1.3'
+gem 'puppet_metadata', '~> 3.4'
 gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
-gem 'voxpupuli-acceptance', '~> 1.0', {"groups"=>["system_tests"]}
+gem 'voxpupuli-acceptance', '~> 2.0', {"groups"=>["system_tests"]}
 gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}
 gem 'hocon'
 
-# Pin rdoc to prevent updating bundled psych (https://github.com/ruby/rdoc/commit/ebe185c8775b2afe844eb3da6fa78adaa79e29a4)
-gem 'rdoc', '< 6.4'
-
 # vim:ft=ruby

spec/acceptance/puppet_spec.rb

@@ -2,7 +2,7 @@
 
 describe 'Scenario: install puppet' do
   before(:context) do
-    on default, puppet('resource', 'service', 'puppet', 'ensure=stopped', 'enable=false')
+    on default, 'puppet resource service puppet ensure=stopped enable=false'
   end
 
   it_behaves_like 'an idempotent resource' do

spec/acceptance/puppetserver_latest_spec.rb

@@ -3,7 +3,7 @@
 describe 'Scenario: install puppetserver (latest):', unless: unsupported_puppetserver do
   before(:all) do
     if check_for_package(default, 'puppetserver')
-      on default, puppet('resource package puppetserver ensure=purged')
+      on default, 'puppet resource package puppetserver ensure=purged'
       on default, 'rm -rf /etc/sysconfig/puppetserver /etc/puppetlabs/puppetserver'
       on default, 'find /etc/puppetlabs/puppet/ssl/ -type f -delete'
     end

spec/acceptance/puppetserver_upgrade_spec.rb

@@ -1,84 +1,86 @@
 require 'spec_helper_acceptance'
 
-describe 'Scenario: minor version upgrade', unless: unsupported_puppetserver do
-  before(:all) do
-    if check_for_package(default, 'puppetserver')
-      on default, puppet('resource package puppetserver ensure=purged')
-      on default, 'rm -rf /etc/sysconfig/puppetserver /etc/puppetlabs/puppetserver'
-      on default, 'rm -rf /etc/puppetlabs/puppet/ssl'
-    end
+unless unsupported_puppetserver
+  describe 'Scenario: minor version upgrade' do
+    before(:all) do
+      if check_for_package(default, 'puppetserver')
+        on default, 'puppet resource package puppetserver ensure=purged'
+        on default, 'rm -rf /etc/sysconfig/puppetserver /etc/puppetlabs/puppetserver'
+        on default, 'rm -rf /etc/puppetlabs/puppet/ssl'
+      end
 
-    # puppetserver won't start with low memory
-    memoryfree_mb = fact('memoryfree_mb').to_i
-    raise 'At least 256MB free memory required' if memoryfree_mb < 256
-  end
+      # puppetserver won't start with low memory
+      memoryfree_mb = fact('memoryfree_mb').to_i
+      raise 'At least 256MB free memory required' if memoryfree_mb < 256
+    end
 
-  case ENV['BEAKER_PUPPET_COLLECTION']
-  when 'puppet7'
-    from_version = '7.0.0'
-    to_version = '7.2.0'
-  else
-    raise 'Unsupported Puppet collection'
-  end
+    case ENV['BEAKER_PUPPET_COLLECTION']
+    when 'puppet7'
+      from_version = '7.0.0'
+      to_version = '7.2.0'
+    else
+      raise 'Unsupported Puppet collection'
+    end
 
-  case fact('osfamily')
-  when 'Debian'
-    from_version_exact = "#{from_version}-1#{fact('os.distro.codename')}"
-    to_version_exact = "#{to_version}-1#{fact('os.distro.codename')}"
-  else
-    from_version_exact = from_version
-    to_version_exact = to_version
-  end
+    case fact('osfamily')
+    when 'Debian'
+      from_version_exact = "#{from_version}-1#{fact('os.distro.codename')}"
+      to_version_exact = "#{to_version}-1#{fact('os.distro.codename')}"
+    else
+      from_version_exact = from_version
+      to_version_exact = to_version
+    end
 
-  context "install #{from_version}" do
-    it_behaves_like 'an idempotent resource' do
-      let(:manifest) do
-        <<-EOS
-        class { 'puppet':
-          server         => true,
-          server_version => '#{from_version_exact}',
-        }
-        EOS
+    context "install #{from_version}" do
+      it_behaves_like 'an idempotent resource' do
+        let(:manifest) do
+          <<-EOS
+          class { 'puppet':
+            server         => true,
+            server_version => '#{from_version_exact}',
+          }
+          EOS
+        end
       end
-    end
 
-    describe command('puppetserver --version') do
-      its(:stdout) { is_expected.to match("puppetserver version: #{from_version}\n") }
-    end
+      describe command('puppetserver --version') do
+        its(:stdout) { is_expected.to match("puppetserver version: #{from_version}\n") }
+      end
 
-    describe service('puppetserver') do
-      it { is_expected.to be_enabled }
-      it { is_expected.to be_running }
-    end
+      describe service('puppetserver') do
+        it { is_expected.to be_enabled }
+        it { is_expected.to be_running }
+      end
 
-    describe port('8140') do
-      it { is_expected.to be_listening }
+      describe port('8140') do
+        it { is_expected.to be_listening }
+      end
     end
-  end
 
-  context "upgrade to #{to_version}" do
-    it_behaves_like 'an idempotent resource' do
-      let(:manifest) do
-        <<-EOS
-        class { 'puppet':
-          server         => true,
-          server_version => '#{to_version_exact}',
-        }
-        EOS
+    context "upgrade to #{to_version}" do
+      it_behaves_like 'an idempotent resource' do
+        let(:manifest) do
+          <<-EOS
+          class { 'puppet':
+            server         => true,
+            server_version => '#{to_version_exact}',
+          }
+          EOS
+        end
       end
-    end
 
-    describe command('puppetserver --version') do
-      its(:stdout) { is_expected.to match("puppetserver version: #{to_version}\n") }
-    end
+      describe command('puppetserver --version') do
+        its(:stdout) { is_expected.to match("puppetserver version: #{to_version}\n") }
+      end
 
-    describe service('puppetserver') do
-      it { is_expected.to be_enabled }
-      it { is_expected.to be_running }
-    end
+      describe service('puppetserver') do
+        it { is_expected.to be_enabled }
+        it { is_expected.to be_running }
+      end
 
-    describe port('8140') do
-      it { is_expected.to be_listening }
+      describe port('8140') do
+        it { is_expected.to be_listening }
+      end
     end
   end
 end

spec/spec_helper_acceptance.rb

@@ -1,6 +1,6 @@
 require 'voxpupuli/acceptance/spec_helper_acceptance'
 
-ENV['BEAKER_setfile'] ||= 'centos7-64{hostname=centos7-64.example.com}'
+ENV['BEAKER_setfile'] ||= 'centos8-64{hostname=centos8-64.example.com}'
 
 configure_beaker(modules: :fixtures) do |host|
   if fact_on(host, 'os.family') == 'RedHat'