Skip to content

Commit 9d5ce96

Browse files
committed
modulesync 4.2.0
1 parent 111c1b0 commit 9d5ce96

25 files changed

+201
-985
lines changed

.editorconfig

+2-1
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

+9-36
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,16 @@ 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.
3232
* Push the branch to your fork and submit a pull request.
3333

3434
Please be prepared to repeat some of these steps as our contributors review your code.
3535

36+
Also consider sending in your profile code that calls this component module as an acceptance test or provide it via an issue. This helps reviewers a lot to test your use case and prevents future regressions!
37+
3638
## Writing proper commits - short version
3739

3840
* Make commits of logical units.
@@ -230,50 +232,21 @@ simple tests against it after applying the module. You can run this
230232
with:
231233

232234
```sh
233-
bundle exec rake acceptance
234-
```
235-
236-
This will run the tests on the module's default nodeset. You can override the
237-
nodeset used, e.g.,
238-
239-
```sh
240-
BEAKER_set=centos-7-x64 bundle exec rake acceptance
241-
```
242-
243-
There are default rake tasks for the various acceptance test modules, e.g.,
244-
245-
```sh
246-
bundle exec rake beaker:centos-7-x64
247-
bundle exec rake beaker:ssh:centos-7-x64
235+
BEAKER_setfile=debian10-x64 bundle exec rake beaker
248236
```
249237

250-
If you don't want to have to recreate the virtual machine every time you can
251-
use `BEAKER_destroy=no` and `BEAKER_provision=no`. On the first run you will at
252-
least need `BEAKER_provision` set to yes (the default). The Vagrantfile for the
253-
created virtual machines will be in `.vagrant/beaker_vagrant_files`.
254-
255-
Beaker also supports docker containers. We also use that in our automated CI
256-
pipeline at [travis-ci](http://travis-ci.org). To use that instead of Vagrant:
257-
258-
```sh
259-
PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker} BEAKER_destroy=yes bundle exec rake beaker
260-
```
261-
262-
You can replace the string `debian9` with any common operating system.
238+
You can replace the string `debian10` with any common operating system.
263239
The following strings are known to work:
264240

265241
* ubuntu1604
266242
* ubuntu1804
267-
* debian8
243+
* ubuntu2004
268244
* debian9
269-
* centos6
245+
* debian10
270246
* centos7
247+
* centos8
271248

272-
The easiest way to debug in a docker container is to open a shell:
273-
274-
```sh
275-
docker exec -it -u root ${container_id_or_name} bash
276-
```
249+
For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).
277250

278251
The source of this file is in our [modulesync_config](https://github.com/voxpupuli/modulesync_config/blob/master/moduleroot/.github/CONTRIBUTING.md.erb)
279252
repository.

.github/SECURITY.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Vox Pupuli Security Policy
2+
3+
Our vulnerabilities reporting process is at https://voxpupuli.org/security/

.github/workflows/ci.yml

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
5+
name: CI
6+
7+
on: pull_request
8+
9+
jobs:
10+
setup_matrix:
11+
name: 'Setup Test Matrix'
12+
runs-on: ubuntu-latest
13+
timeout-minutes: 40
14+
outputs:
15+
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 }}
17+
env:
18+
BUNDLE_WITHOUT: development:system_tests:release
19+
steps:
20+
- uses: actions/checkout@v2
21+
- name: Setup ruby
22+
uses: ruby/setup-ruby@v1
23+
with:
24+
ruby-version: '3.0'
25+
bundler-cache: true
26+
- name: Run static validations
27+
run: bundle exec rake validate lint check
28+
- name: Run rake rubocop
29+
run: bundle exec rake rubocop
30+
- name: Setup Test Matrix
31+
id: get-outputs
32+
run: bundle exec metadata2gha --use-fqdn --pidfile-workaround false
33+
34+
unit:
35+
needs: setup_matrix
36+
runs-on: ubuntu-latest
37+
timeout-minutes: 40
38+
strategy:
39+
fail-fast: false
40+
matrix:
41+
include: ${{fromJson(needs.setup_matrix.outputs.puppet_unit_test_matrix)}}
42+
env:
43+
BUNDLE_WITHOUT: development:system_tests:release
44+
PUPPET_VERSION: "~> ${{ matrix.puppet }}.0"
45+
name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }})
46+
steps:
47+
- uses: actions/checkout@v2
48+
- name: Setup ruby
49+
uses: ruby/setup-ruby@v1
50+
with:
51+
ruby-version: ${{ matrix.ruby }}
52+
bundler-cache: true
53+
- name: Run tests
54+
run: bundle exec rake parallel_spec
55+
56+
tests:
57+
needs:
58+
- unit
59+
runs-on: ubuntu-latest
60+
name: Test suite
61+
steps:
62+
- run: echo Test suite completed

.github/workflows/release.yml

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
5+
name: Release
6+
7+
on:
8+
push:
9+
tags:
10+
- '*'
11+
12+
env:
13+
BUNDLE_WITHOUT: development:test:system_tests
14+
15+
jobs:
16+
deploy:
17+
name: 'deploy to forge'
18+
runs-on: ubuntu-latest
19+
if: github.repository_owner == 'voxpupuli'
20+
steps:
21+
- name: Checkout repository
22+
uses: actions/checkout@v2
23+
- name: Setup Ruby
24+
uses: ruby/setup-ruby@v1
25+
with:
26+
ruby-version: '2.7'
27+
bundler-cache: true
28+
- name: Build and Deploy
29+
env:
30+
# Configure secrets here:
31+
# https://docs.github.com/en/free-pro-team@latest/actions/reference/encrypted-secrets
32+
BLACKSMITH_FORGE_USERNAME: '${{ secrets.PUPPET_FORGE_USERNAME }}'
33+
BLACKSMITH_FORGE_API_KEY: '${{ secrets.PUPPET_FORGE_API_KEY }}'
34+
run: bundle exec rake module:push

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
pkg/
25
Gemfile.lock
36
Gemfile.local

.msync.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
modulesync_config_version: '2.10.1'
1+
---
2+
# Managed by modulesync - DO NOT EDIT
3+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
4+
5+
modulesync_config_version: '4.2.0'

.overcommit.yml

+3-2
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
#
@@ -61,4 +62,4 @@ PrePush:
6162
- 'validate'
6263
- 'test'
6364
- 'rubocop'
64-
command: [ 'bundle', 'exec', 'rake' ]
65+
command: ['bundle', 'exec', 'rake']

.pmtignore

+18-2
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,37 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
docs/
25
pkg/
6+
Gemfile
37
Gemfile.lock
48
Gemfile.local
59
vendor/
610
.vendor/
7-
spec/fixtures/manifests/
8-
spec/fixtures/modules/
11+
spec/
12+
Rakefile
913
.vagrant/
1014
.bundle/
1115
.ruby-version
1216
coverage/
1317
log/
1418
.idea/
1519
.dependencies/
20+
.github/
1621
.librarian/
1722
Puppetfile.lock
1823
*.iml
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
1934
.*.sw?
2035
.yardoc/
36+
.yardopts
2137
Dockerfile

.rspec

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
# Managed by modulesync - DO NOT EDIT
2+
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
3+
14
--format documentation
25
--color

.rspec_parallel

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

0 commit comments

Comments
 (0)