Skip to content

Commit 10ce29f

Browse files
committed
Modulesync 5.3.0
1 parent e233bc3 commit 10ce29f

File tree

5 files changed

+11
-84
lines changed

5 files changed

+11
-84
lines changed

.github/workflows/ci.yml

+6-80
Original file line numberDiff line numberDiff line change
@@ -7,86 +7,12 @@ name: CI
77
on: pull_request
88

99
concurrency:
10-
group: ${{ github.head_ref }}
10+
group: ${{ github.ref_name }}
1111
cancel-in-progress: true
1212

1313
jobs:
14-
setup_matrix:
15-
name: 'Setup Test Matrix'
16-
runs-on: ubuntu-latest
17-
timeout-minutes: 40
18-
outputs:
19-
puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
20-
github_action_test_matrix: ${{ steps.get-outputs.outputs.github_action_test_matrix }}
21-
env:
22-
BUNDLE_WITHOUT: development:system_tests:release
23-
steps:
24-
- uses: actions/checkout@v2
25-
- name: Setup ruby
26-
uses: ruby/setup-ruby@v1
27-
with:
28-
ruby-version: '3.0'
29-
bundler-cache: true
30-
- name: Run static validations
31-
run: bundle exec rake validate lint check
32-
- name: Run rake rubocop
33-
run: bundle exec rake rubocop
34-
- name: Setup Test Matrix
35-
id: get-outputs
36-
run: bundle exec metadata2gha --use-fqdn --pidfile-workaround CentOS,Ubuntu
37-
38-
unit:
39-
needs: setup_matrix
40-
runs-on: ubuntu-latest
41-
timeout-minutes: 40
42-
strategy:
43-
fail-fast: false
44-
matrix:
45-
include: ${{fromJson(needs.setup_matrix.outputs.puppet_unit_test_matrix)}}
46-
env:
47-
BUNDLE_WITHOUT: development:system_tests:release
48-
PUPPET_VERSION: "~> ${{ matrix.puppet }}.0"
49-
name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }})
50-
steps:
51-
- uses: actions/checkout@v2
52-
- name: Setup ruby
53-
uses: ruby/setup-ruby@v1
54-
with:
55-
ruby-version: ${{ matrix.ruby }}
56-
bundler-cache: true
57-
- name: Run tests
58-
run: bundle exec rake parallel_spec
59-
60-
acceptance:
61-
needs: setup_matrix
62-
runs-on: ubuntu-latest
63-
env:
64-
LANG: en_US
65-
LC_ALL: en_US.UTF-8
66-
BUNDLE_WITHOUT: development:test:release
67-
strategy:
68-
fail-fast: false
69-
matrix:
70-
include: ${{fromJson(needs.setup_matrix.outputs.github_action_test_matrix)}}
71-
name: ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }}
72-
steps:
73-
- uses: actions/checkout@v2
74-
- name: Setup ruby
75-
uses: ruby/setup-ruby@v1
76-
with:
77-
ruby-version: '3.0'
78-
bundler-cache: true
79-
- name: Run tests
80-
run: bundle exec rake beaker
81-
env:
82-
BEAKER_PUPPET_COLLECTION: ${{ matrix.puppet.collection }}
83-
BEAKER_setfile: ${{ matrix.setfile.value }}
84-
85-
tests:
86-
needs:
87-
- unit
88-
- acceptance
89-
runs-on: ubuntu-latest
90-
name: Test suite
91-
steps:
92-
- run: echo Test suite completed
14+
puppet:
15+
name: Puppet
16+
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
17+
with:
18+
pidfile_workaround: 'CentOS,Ubuntu'

.msync.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Managed by modulesync - DO NOT EDIT
33
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
44

5-
modulesync_config_version: '5.2.0'
5+
modulesync_config_version: '5.3.0'

.rubocop.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
---
2-
inherit_from: .rubocop_todo.yml
3-
42
# Managed by modulesync - DO NOT EDIT
53
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
64

5+
inherit_from: .rubocop_todo.yml
76
inherit_gem:
87
voxpupuli-test: rubocop.yml

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
source ENV['GEM_SOURCE'] || 'https://rubygems.org'
55

66
group :test do
7-
gem 'voxpupuli-test', '~> 5.0', :require => false
7+
gem 'voxpupuli-test', '~> 5.4', :require => false
88
gem 'coveralls', :require => false
99
gem 'simplecov-console', :require => false
1010
gem 'puppet_metadata', '~> 1.0', :require => false

spec/spec_helper.rb

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313

1414
require 'voxpupuli/test/spec_helper'
1515

16+
add_mocked_facts!
17+
1618
if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
1719
facts = YAML.safe_load(File.read(File.join(__dir__, 'default_module_facts.yml')))
1820
facts&.each do |name, value|

0 commit comments

Comments
 (0)