diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2e9cc181..1f2d2919 100644 --- a/.github/workflows/ci.yml +++ b/.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' diff --git a/Gemfile b/Gemfile index 9126e667..dc219cfd 100644 --- a/Gemfile +++ b/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 diff --git a/spec/classes/foreman_proxy_content_spec.rb b/spec/classes/foreman_proxy_content_spec.rb index 226d7dbd..ea6079bb 100644 --- a/spec/classes/foreman_proxy_content_spec.rb +++ b/spec/classes/foreman_proxy_content_spec.rb @@ -15,7 +15,7 @@ .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]') @@ -23,7 +23,7 @@ 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') diff --git a/spec/defines/foreman_proxy_content__reverse_proxy_spec.rb b/spec/defines/foreman_proxy_content__reverse_proxy_spec.rb index 13cc50f1..b5443897 100644 --- a/spec/defines/foreman_proxy_content__reverse_proxy_spec.rb +++ b/spec/defines/foreman_proxy_content__reverse_proxy_spec.rb @@ -17,13 +17,13 @@ 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