Update to gha-puppet v3 & voxpupuli-test 9.x

.github/workflows/ci.yml

@@ -17,8 +17,7 @@ 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'
       rubocop: false
-      cache-version: '1'

Gemfile

@@ -8,11 +8,11 @@ gem 'rake'
 
 gem 'kafo_module_lint', {"groups"=>["test"]}
 gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 1.0', {"groups"=>["test"]}
-gem 'voxpupuli-test', '~> 7.0', {"groups"=>["test"]}
+gem 'voxpupuli-test', '~> 9.0', {"groups"=>["test"]}
 gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]}
 gem 'puppet_metadata', '~> 4.0'
 gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]}
-gem 'voxpupuli-acceptance', '~> 3.0', {"groups"=>["system_tests"]}
+gem 'voxpupuli-acceptance', '~> 3.4', {"groups"=>["system_tests"]}
 gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]}
 
 # vim:ft=ruby

spec/classes/foreman_proxy_content_spec.rb

@@ -15,15 +15,15 @@
             .with(content_service_worker_timeout: 90)
             .with(api_service_worker_timeout: 90)
             .with(allowed_content_checksums: ['sha1', 'sha224', 'sha256', 'sha384', 'sha512'])
-            .with(api_client_auth_cn_map: {facts[:fqdn] => 'admin'})
+            .with(api_client_auth_cn_map: {facts[:networking]['fqdn'] => 'admin'})
             .with(allowed_import_path: ['/var/lib/pulp/sync_imports', '/var/lib/pulp/imports'])
             .with(allowed_export_path: ['/var/lib/pulp/exports'])
             .that_comes_before('Class[foreman_proxy::plugin::pulp]')
         end
 
         it do
           is_expected.to contain_class('foreman_proxy::plugin::pulp')
-            .with_rhsm_url("https://#{facts[:fqdn]}:443/rhsm")
+            .with_rhsm_url("https://#{facts[:networking]['fqdn']}:443/rhsm")
         end
 
         context 'with custom import/export paths as arrays' do
@@ -196,7 +196,7 @@
         end
         it do
           is_expected.to contain_class('foreman_proxy::plugin::pulp')
-            .with_rhsm_url("https://#{facts[:fqdn]}:443/rhsm")
+            .with_rhsm_url("https://#{facts[:networking]['fqdn']}:443/rhsm")
         end
         it do
           is_expected.not_to contain_foreman_proxy_content__reverse_proxy('rhsm-pulpcore-https-8443')

spec/defines/foreman_proxy_content__reverse_proxy_spec.rb

@@ -14,16 +14,16 @@
           PUPPET
         end
 
         it { is_expected.to compile.with_all_deps }
         it do
           is_expected.to contain_apache__vhost('my-reverse-proxy')
-            .with_servername(facts[:fqdn])
+            .with_servername(facts[:networking]['fqdn'])
             .with_serveraliases([])
             .with_port(443)
             .with_proxy_pass([{
               'path' => '/',
-              'url' => "https://#{facts[:fqdn]}/",
-              'reverse_urls' => ["https://#{facts[:fqdn]}/"],
+              'url' => "https://#{facts[:networking]['fqdn']}/",
+              'reverse_urls' => ["https://#{facts[:networking]['fqdn']}/"],
               'params' => {'disablereuse' => 'on', 'retry' => '0'},
             }])
         end
@@ -33,8 +33,8 @@
         let(:params) { { path_url_map: {'/' => 'https://foreman.example.com/'}, port: 443 } }
         let(:title) { 'katello-reverse-proxy-443' }
 
         it { is_expected.to compile.with_all_deps }
         it do
           is_expected.to contain_apache__vhost('katello-reverse-proxy-443')
             .with_servername('foo.example.com')
             .with_serveraliases([])
@@ -61,8 +61,8 @@
           end
           let(:title) { 'katello-reverse-proxy' }
 
           it { is_expected.to compile.with_all_deps }
           it do
             is_expected.to contain_apache__vhost('katello-reverse-proxy')
               .with_servername('proxy.example.com')
               .with_serveraliases(['proxy-01.example.com'])
@@ -73,16 +73,16 @@
           let(:params) { super().merge(vhost_params: {keepalive: 'on'}) }
           let(:title) { 'katello-reverse-proxy' }
 
           it { is_expected.to compile.with_all_deps }
           it { is_expected.to contain_apache__vhost('katello-reverse-proxy').with_keepalive('on') }
         end
 
         context 'with proxy_pass_params' do
           let(:params) { super().merge(proxy_pass_params: {disablereuse: 'off'}) }
           let(:title) { 'katello-reverse-proxy' }
 
           it { is_expected.to compile.with_all_deps }
           it do
             is_expected.to contain_apache__vhost('katello-reverse-proxy')
               .with_proxy_pass([{
                 'path' => '/',