Skip to content

Commit

Permalink
more chnanges
Browse files Browse the repository at this point in the history
  • Loading branch information
benjamin-robertson committed Jun 20, 2024
1 parent ea3f0cb commit 66587ac
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/acceptance_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
cat $GITHUB_OUTPUT
acceptance:
name: "Acceptance tests (${{matrix.platform}}, ${{matrix.collection}}, ${{matrix.gem_version}})"
name: "Acceptance tests (${{matrix.collection.agent_version}})"
needs:
- setup_matrix
if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
Expand All @@ -55,7 +55,7 @@ jobs:
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}

env:
PUPPET_GEM_VERSION: ${{matrix.gem_version}}
PUPPET_GEM_VERSION: ${{matrix.collection.gem_version}}
FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main' # why is this set?

steps:
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
- name: Install Agents and module
run: |
# bundle exec rake 'litmus:install_agent'
bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
bundle exec rake 'litmus:install_agent[${{ matrix.collection.agent_version }}]'
bundle exec rake litmus:install_module
- name: Run integration tests
Expand Down
4 changes: 3 additions & 1 deletion spec/acceptance/observium_install_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@ class { 'observium':
idempotent_apply(pp)
end
else
apply_manifest(pp)
it 'applies' do
apply_manifest(pp)
end
end

describe file('/opt/observium/config.php') do
Expand Down
17 changes: 8 additions & 9 deletions test_matrix.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
{
"platform": [
"centos-stream8"
],
"collection": [
"puppet7",
"puppet8"
],
"gem_version": [
"~> 7.31",
"~> 8.7"
{
"agent_version": "puppet7",
"gem_version": "~> 7.31"
},
{
"agent_version": "puppet8",
"gem_version": "~> 8.7"
}
]
}

0 comments on commit 66587ac

Please sign in to comment.