diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06ee271..1f2d291 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,6 +3,11 @@ name: CI on: pull_request: + push: + branches: + - 'develop' + - 'master' + - '*-stable' concurrency: @@ -12,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 9126e66..dc219cf 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/lib/facter/rh_certificates.rb b/lib/facter/rh_certificates.rb index 96c78c8..d6a9ed1 100644 --- a/lib/facter/rh_certificates.rb +++ b/lib/facter/rh_certificates.rb @@ -2,7 +2,8 @@ confine kernel: 'Linux' setcode do data = Facter::Util::Resolution.exec('/usr/sbin/subscription-manager config') - break if data.nil? || data.empty? + next if data.nil? || data.empty? + data_hash = data.gsub(/[\n\[\]]/, "").scan(/(\S+)\s*=\s* ([^ ]+)/).to_h consumer_cert_dir = data_hash["consumercertdir"] { diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb index 198b97b..ef27f85 100644 --- a/spec/acceptance/basic_spec.rb +++ b/spec/acceptance/basic_spec.rb @@ -5,7 +5,8 @@ let(:manifest) do <<~PUPPET class { 'foreman_scap_client': - foreman_repo_rel => 'nightly', + # Since 3.14 the Ruby implementation is replaced by bash + foreman_repo_rel => '3.13', server => 'foreman.example.com', port => 8443, policies => [],