Skip to content

Commit 2f5249d

Browse files
authored
Merge pull request #732 from voxpupuli/exclude-bogus-acceptance-test-config
Limit to known-good setups from acceptance tests
2 parents 10553c0 + 66fa47b commit 2f5249d

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

config_defaults.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Gemfile:
1818
- gem: coveralls
1919
- gem: simplecov-console
2020
- gem: puppet_metadata
21-
version: '~> 0.3.0'
21+
version: '~> 1.0'
2222
':development':
2323
- gem: guard-rake
2424
- gem: overcommit

moduleroot/.github/workflows/ci.yml.erb

+2-4
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ jobs:
1212
runs-on: ubuntu-latest
1313
timeout-minutes: <%= @configs['timeout_minutes'] %>
1414
outputs:
15-
beaker_setfiles: ${{ steps.get-outputs.outputs.beaker_setfiles }}
16-
puppet_major_versions: ${{ steps.get-outputs.outputs.puppet_major_versions }}
1715
puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
16+
github_action_test_matrix: ${{ steps.get-outputs.outputs.github_action_test_matrix }}
1817
env:
1918
BUNDLE_WITHOUT: development:system_tests:release
2019
steps:
@@ -63,8 +62,7 @@ jobs:
6362
strategy:
6463
fail-fast: false
6564
matrix:
66-
setfile: ${{fromJson(needs.setup_matrix.outputs.beaker_setfiles)}}
67-
puppet: ${{fromJson(needs.setup_matrix.outputs.puppet_major_versions)}}
65+
include: ${{fromJson(needs.setup_matrix.outputs.github_action_test_matrix)}}
6866
<%- @configs['beaker_fact_matrix'].each do |option, values| -%>
6967
<%= option %>:
7068
<%- values.each do |value| -%>

0 commit comments

Comments
 (0)