Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Mar 21, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ name: CI

on:
pull_request:
push:
branches:
- 'develop'
- 'master'
- '*-stable'


concurrency:
Expand All @@ -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'
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion lib/facter/rh_certificates.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
{
Expand Down
3 changes: 2 additions & 1 deletion spec/acceptance/basic_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 => [],
Expand Down
Loading