diff --git a/.github/workflows/acceptance_test.yml b/.github/workflows/acceptance_test.yml index cec9a81..cb91138 100644 --- a/.github/workflows/acceptance_test.yml +++ b/.github/workflows/acceptance_test.yml @@ -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 != '{}' }} @@ -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: @@ -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 diff --git a/spec/acceptance/observium_install_spec.rb b/spec/acceptance/observium_install_spec.rb index e4d89fe..5d4f034 100644 --- a/spec/acceptance/observium_install_spec.rb +++ b/spec/acceptance/observium_install_spec.rb @@ -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 diff --git a/test_matrix.json b/test_matrix.json index dff7f4a..3df0627 100644 --- a/test_matrix.json +++ b/test_matrix.json @@ -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" + } ] }