Skip to content

Commit

Permalink
Use system Puppet in CI
Browse files Browse the repository at this point in the history
This uses the official Puppet AIO packages, which is also what we use in
production. This makes the tests more realistic.
  • Loading branch information
ekohl committed May 8, 2024
1 parent 74387d2 commit 92acace
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 7 deletions.
16 changes: 11 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,23 @@ jobs:
matrix:
include:
- ruby: '2.7'
puppet: '7.0'
puppet: '7'
- ruby: '3.0'
puppet: '7.0'
puppet: '7'
- ruby: '3.2'
puppet: '8.0'
puppet: '8'
env:
PUPPET_VERSION: ${{ matrix.puppet }}
PUPPET_VERSION: system
steps:
- uses: actions/checkout@v4
- name: Set up Puppet repositories
run: |
. /etc/os-release
wget "https://apt.puppet.com/puppet${{ matrix.puppet }}-release-${VERSION_CODENAME}.deb"
sudo apt install "puppet${{ matrix.puppet }}-release-${VERSION_CODENAME}.deb"
sudo apt update
- name: Install system dependencies
run: sudo apt-get install -y --no-install-recommends asciidoc
run: sudo apt-get install -y --no-install-recommends asciidoc puppet-agent
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
7 changes: 5 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ gem 'rdoc', '< 6.4'

gem 'kafo', '>= 7.3', '< 8'
gem 'librarian-puppet', '>= 3.0'
gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '~> 7.0'
gem 'facter', '>= 3.0', '!= 4.0.52'

group :puppet, optional: ENV.fetch('PUPPET_VERSION', nil) == 'system' do
gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '~> 7.0'
gem 'facter', '>= 3.0', '!= 4.0.52'
end

gem 'puppet-strings'
gem 'rake'
Expand Down

0 comments on commit 92acace

Please sign in to comment.