Skip to content

Commit c5eebe5

Browse files
zipkidzipkid
authored
Merge branch 'master' into requirements_subscribe_fix
2 parents bba491a + e15cfa7 commit c5eebe5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1145
-767
lines changed

‎.editorconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# editorconfig.org
22

3-
# MANAGED BY MODULESYNC
3+
# Managed by modulesync - DO NOT EDIT
4+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
45

56
root = true
67

‎.github/CONTRIBUTING.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ By participating in this project you agree to abide by its terms.
2525

2626
* Fork the repo.
2727
* Create a separate branch for your change.
28-
* We only take pull requests with passing tests, and documentation. [travis-ci](http://travis-ci.org) runs the tests for us. You can also execute them locally. This is explained [in a later section](#the-test-matrix).
28+
* We only take pull requests with passing tests, and documentation. [GitHub Actions](https://docs.github.com/en/actions) run the tests for us. You can also execute them locally. This is explained [in a later section](#the-test-matrix).
2929
* Checkout [our docs](https://voxpupuli.org/docs/reviewing_pr/) we use to review a module and the [official styleguide](https://puppet.com/docs/puppet/6.0/style_guide.html). They provide some guidance for new code that might help you before you submit a pull request.
3030
* Add a test for your change. Only refactoring and documentation changes require no new tests. If you are adding functionality or fixing a bug, please add a test.
3131
* Squash your commits down into logical components. Make sure to rebase against our current master.
@@ -124,7 +124,7 @@ If you have Ruby 2.x or want a specific version of Puppet,
124124
you must set an environment variable such as:
125125

126126
```sh
127-
export PUPPET_VERSION="~> 5.5.6"
127+
export PUPPET_GEM_VERSION="~> 6.1.0"
128128
```
129129

130130
You can install all needed gems for spec tests into the modules directory by
@@ -232,19 +232,21 @@ simple tests against it after applying the module. You can run this
232232
with:
233233

234234
```sh
235-
BEAKER_setfile=debian10-x64 bundle exec rake beaker
235+
BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
236236
```
237237

238-
You can replace the string `debian10` with any common operating system.
238+
You can replace the string `debian11` with any common operating system.
239239
The following strings are known to work:
240240

241-
* ubuntu1604
242-
* ubuntu1804
243241
* ubuntu2004
244-
* debian9
245-
* debian10
242+
* ubuntu2204
243+
* debian11
246244
* centos7
247245
* centos8
246+
* centos9
247+
* almalinux8
248+
* almalinux9
249+
* fedora36
248250

249251
For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).
250252

‎.github/SECURITY.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.github/workflows/ci.yml

Lines changed: 13 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,18 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
15
name: CI
26

37
on: pull_request
48

5-
jobs:
6-
setup_matrix:
7-
name: 'Setup Test Matrix'
8-
runs-on: ubuntu-latest
9-
timeout-minutes: 40
10-
outputs:
11-
beaker_setfiles: ${{ steps.get-outputs.outputs.beaker_setfiles }}
12-
puppet_major_versions: ${{ steps.get-outputs.outputs.puppet_major_versions }}
13-
puppet_unit_test_matrix: ${{ steps.get-outputs.outputs.puppet_unit_test_matrix }}
14-
env:
15-
BUNDLE_WITHOUT: development:release
16-
steps:
17-
- uses: actions/checkout@v2
18-
- name: Setup ruby
19-
uses: ruby/setup-ruby@v1
20-
with:
21-
ruby-version: '2.7'
22-
bundler-cache: true
23-
- name: Run rake validate
24-
run: bundle exec rake validate
25-
- name: Run rake rubocop
26-
run: bundle exec rake rubocop
27-
- name: Setup Test Matrix
28-
id: get-outputs
29-
run: bundle exec metadata2gha --use-fqdn --pidfile-workaround false
30-
31-
unit:
32-
needs: setup_matrix
33-
runs-on: ubuntu-latest
34-
timeout-minutes: 40
35-
strategy:
36-
fail-fast: false
37-
matrix:
38-
include: ${{fromJson(needs.setup_matrix.outputs.puppet_unit_test_matrix)}}
39-
env:
40-
BUNDLE_WITHOUT: development:system_tests:release
41-
PUPPET_VERSION: "~> ${{ matrix.puppet }}.0"
42-
name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }})
43-
steps:
44-
- uses: actions/checkout@v2
45-
- name: Setup ruby
46-
uses: ruby/setup-ruby@v1
47-
with:
48-
ruby-version: ${{ matrix.ruby }}
49-
bundler-cache: true
50-
- name: Run tests
51-
run: bundle exec rake
9+
concurrency:
10+
group: ${{ github.ref_name }}
11+
cancel-in-progress: true
5212

53-
acceptance:
54-
needs: setup_matrix
55-
runs-on: ubuntu-latest
56-
env:
57-
BUNDLE_WITHOUT: development:test:release
58-
strategy:
59-
fail-fast: false
60-
matrix:
61-
setfile: ${{fromJson(needs.setup_matrix.outputs.beaker_setfiles)}}
62-
puppet: ${{fromJson(needs.setup_matrix.outputs.puppet_major_versions)}}
63-
name: ${{ matrix.puppet.name }} - ${{ matrix.setfile.name }}
64-
steps:
65-
- uses: actions/checkout@v2
66-
- name: Setup ruby
67-
uses: ruby/setup-ruby@v1
68-
with:
69-
ruby-version: '2.7'
70-
bundler-cache: true
71-
- name: Run tests
72-
run: bundle exec rake beaker
73-
env:
74-
BEAKER_PUPPET_COLLECTION: ${{ matrix.puppet.collection }}
75-
BEAKER_setfile: ${{ matrix.setfile.value }}
13+
jobs:
14+
puppet:
15+
name: Puppet
16+
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
17+
with:
18+
pidfile_workaround: 'false'

‎.github/workflows/release.yml

Lines changed: 14 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,22 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
15
name: Release
26

37
on:
48
push:
59
tags:
610
- '*'
711

8-
env:
9-
BUNDLE_WITHOUT: development:test:system_tests
10-
1112
jobs:
12-
deploy:
13-
name: 'deploy to forge'
14-
runs-on: ubuntu-latest
15-
steps:
16-
- name: Checkout repository
17-
uses: actions/checkout@v2
18-
- name: Setup Ruby
19-
uses: ruby/setup-ruby@v1
20-
with:
21-
ruby-version: '2.7'
22-
bundler-cache: true
23-
- name: Build and Deploy
24-
env:
25-
# Configure secrets here:
26-
# https://docs.github.com/en/free-pro-team@latest/actions/reference/encrypted-secrets
27-
BLACKSMITH_FORGE_USERNAME: '${{ secrets.PUPPET_FORGE_USERNAME }}'
28-
BLACKSMITH_FORGE_API_KEY: '${{ secrets.PUPPET_FORGE_API_KEY }}'
29-
run: bundle exec rake module:push
13+
release:
14+
name: Release
15+
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1
16+
with:
17+
allowed_owner: 'voxpupuli'
18+
secrets:
19+
# Configure secrets here:
20+
# https://docs.github.com/en/actions/security-guides/encrypted-secrets
21+
username: ${{ secrets.PUPPET_FORGE_USERNAME }}
22+
api_key: ${{ secrets.PUPPET_FORGE_API_KEY }}

‎.gitignore

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1-
pkg/
2-
Gemfile.lock
3-
Gemfile.local
4-
vendor/
5-
.vendor/
6-
spec/fixtures/manifests/
7-
spec/fixtures/modules/
8-
.vagrant/
9-
.bundle/
10-
.ruby-version
11-
coverage/
12-
log/
13-
.idea/
14-
.dependencies/
15-
.librarian/
16-
Puppetfile.lock
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
4+
/pkg/
5+
/Gemfile.lock
6+
/Gemfile.local
7+
/vendor/
8+
/.vendor/
9+
/spec/fixtures/manifests/
10+
/spec/fixtures/modules/
11+
/.vagrant/
12+
/.bundle/
13+
/.ruby-version
14+
/coverage/
15+
/log/
16+
/.idea/
17+
/.dependencies/
18+
/.librarian/
19+
/Puppetfile.lock
1720
*.iml
1821
.*.sw?
19-
.yardoc/
20-
Guardfile
22+
/.yardoc/
23+
/Guardfile

‎.msync.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
---
2-
modulesync_config_version: '4.1.0'
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
5+
modulesync_config_version: '7.0.0'

‎.overcommit.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Managed by https://github.com/voxpupuli/modulesync_configs
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
23
#
34
# Hooks are only enabled if you take action.
45
#

‎.pmtignore

Lines changed: 35 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
1-
docs/
2-
pkg/
3-
Gemfile
4-
Gemfile.lock
5-
Gemfile.local
6-
vendor/
7-
.vendor/
8-
spec/
9-
Rakefile
10-
.vagrant/
11-
.bundle/
12-
.ruby-version
13-
coverage/
14-
log/
15-
.idea/
16-
.dependencies/
17-
.github/
18-
.librarian/
19-
Puppetfile.lock
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
4+
/docs/
5+
/pkg/
6+
/Gemfile
7+
/Gemfile.lock
8+
/Gemfile.local
9+
/vendor/
10+
/.vendor/
11+
/spec/
12+
/Rakefile
13+
/.vagrant/
14+
/.bundle/
15+
/.ruby-version
16+
/coverage/
17+
/log/
18+
/.idea/
19+
/.dependencies/
20+
/.github/
21+
/.librarian/
22+
/Puppetfile.lock
2023
*.iml
21-
.editorconfig
22-
.fixtures.yml
23-
.gitignore
24-
.msync.yml
25-
.overcommit.yml
26-
.pmtignore
27-
.rspec
28-
.rspec_parallel
29-
.rubocop.yml
30-
.sync.yml
24+
/.editorconfig
25+
/.fixtures.yml
26+
/.gitignore
27+
/.msync.yml
28+
/.overcommit.yml
29+
/.pmtignore
30+
/.rspec
31+
/.rspec_parallel
32+
/.rubocop.yml
33+
/.sync.yml
3134
.*.sw?
32-
.yardoc/
33-
.yardopts
34-
Dockerfile
35+
/.yardoc/
36+
/.yardopts
37+
/Dockerfile

‎.puppet-lint.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--fail-on-warnings
2+
--no-parameter_documentation-check

0 commit comments

Comments
 (0)