Skip to content

Commit b3f5df4

Browse files
bastelfreakbastelfreak
authored
Merge pull request #336 from voxpupuli/modulesync
modulesync 7.3.0
2 parents e77eff6 + 23067d3 commit b3f5df4

27 files changed

+594
-641
lines changed

‎.fixtures.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ fixtures:
55
stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
66
zookeeper: 'https://github.com/deric/puppet-zookeeper.git'
77
systemd: 'https://github.com/voxpupuli/puppet-systemd.git'
8-
symlinks:
9-
kafka: "#{source_dir}"

‎.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. GitHub Actions run the tests for us (check the .github/workflows/ directory). 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: 15 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -4,76 +4,20 @@
44

55
name: CI
66

7-
on: pull_request
7+
on:
8+
pull_request: {}
9+
push:
10+
branches:
11+
- main
12+
- master
813

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

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

‎.github/workflows/release.yml‎

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,14 @@ on:
99
tags:
1010
- '*'
1111

12-
env:
13-
BUNDLE_WITHOUT: development:test:system_tests
14-
1512
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
13+
release:
14+
name: Release
15+
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
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: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
# Managed by modulesync - DO NOT EDIT
22
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
33

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
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
2020
*.iml
2121
.*.sw?
22-
.yardoc/
23-
Guardfile
22+
/.yardoc/
23+
/Guardfile

‎.msync.yml‎

Lines changed: 1 addition & 1 deletion
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: '4.1.0'
5+
modulesync_config_version: '7.3.0'

‎.pmtignore‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
# Managed by modulesync - DO NOT EDIT
22
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/
33

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
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
2323
*.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
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
3434
.*.sw?
35-
.yardoc/
36-
.yardopts
37-
Dockerfile
35+
/.yardoc/
36+
/.yardopts
37+
/Dockerfile
38+
/HISTORY.md

‎.puppet-lint.rc‎

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

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ WORKDIR /opt/puppet
88
# https://github.com/puppetlabs/puppet/blob/06ad255754a38f22fb3a22c7c4f1e2ce453d01cb/lib/puppet/provider/service/runit.rb#L39
99
RUN mkdir -p /etc/sv
1010

11-
ARG PUPPET_VERSION="~> 6.0"
11+
ARG PUPPET_GEM_VERSION="~> 6.0"
1212
ARG PARALLEL_TEST_PROCESSORS=4
1313

1414
# Cache gems

0 commit comments

Comments
 (0)