16 changes: 13 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,19 +131,29 @@ You can install all needed gems for spec tests into the modules directory by
running:

```sh
bundle install --path .vendor/ --without development system_tests release --jobs "$(nproc)"
bundle config set --local path '.vendor/'
bundle config set --local without 'development system_tests release'
bundle install --jobs "$(nproc)"
```

If you also want to run acceptance tests:

```sh
bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"
bundle config set --local path '.vendor/'
bundle config set --local without 'development release'
bundle config set --local with 'system_tests'
bundle install --jobs "$(nproc)"
```

Our all in one solution if you don't know if you need to install or update gems:

```sh
bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"; bundle update; bundle clean
bundle config set --local path '.vendor/'
bundle config set --local without 'development release'
bundle config set --local with 'system_tests'
bundle install --jobs "$(nproc)"
bundle update
bundle clean
```

As an alternative to the `--jobs "$(nproc)` parameter, you can set an
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@

name: CI

on: pull_request
on:
pull_request: {}
push:
branches:
- main
- master

concurrency:
group: ${{ github.ref_name }}
Expand All @@ -13,4 +18,6 @@ concurrency:
jobs:
puppet:
name: Puppet
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
with:
pidfile_workaround: 'false'
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
release:
name: Release
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v1
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
with:
allowed_owner: 'voxpupuli'
secrets:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@
.*.sw?
/.yardoc/
/Guardfile
bolt-debug.log
.rerun.json
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '7.0.0'
modulesync_config_version: '7.5.0'
1 change: 1 addition & 0 deletions .pmtignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,4 @@
/.yardoc/
/.yardopts
/Dockerfile
/HISTORY.md
2 changes: 0 additions & 2 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
--fail-on-warnings
--no-parameter_documentation-check
--no-parameter_types-check
4 changes: 4 additions & 0 deletions .sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.puppet-lint.rc:
enabled_lint_checks:
- parameter_documentation
- parameter_types
26 changes: 26 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,32 @@ All notable changes to this project will be documented in this file.
Each new release typically also includes the latest modulesync defaults.
These should not affect the functionality of the module.

## [v13.0.0](https://github.com/voxpupuli/puppet-r10k/tree/v13.0.0) (2024-04-26)

[Full Changelog](https://github.com/voxpupuli/puppet-r10k/compare/v12.2.0...v13.0.0)

**Breaking changes:**

- Drop Ubuntu 18.04 support [\#648](https://github.com/voxpupuli/puppet-r10k/pull/648) ([zilchms](https://github.com/zilchms))

**Implemented enhancements:**

- Add OracleLinux 8 and 9 support [\#650](https://github.com/voxpupuli/puppet-r10k/pull/650) ([zilchms](https://github.com/zilchms))
- Add RHEL 9 support [\#649](https://github.com/voxpupuli/puppet-r10k/pull/649) ([zilchms](https://github.com/zilchms))
- Add Ubuntu 20.04 and 22.04 support [\#647](https://github.com/voxpupuli/puppet-r10k/pull/647) ([zilchms](https://github.com/zilchms))
- Add documentation stubs [\#646](https://github.com/voxpupuli/puppet-r10k/pull/646) ([zilchms](https://github.com/zilchms))

**Fixed bugs:**

- Use File.exist? instead of File.exists? [\#645](https://github.com/voxpupuli/puppet-r10k/pull/645) ([tuxmea](https://github.com/tuxmea))
- restore support for EoL Ruby / Puppet 7; enable acceptance tests [\#642](https://github.com/voxpupuli/puppet-r10k/pull/642) ([zilchms](https://github.com/zilchms))
- Remove legacy top-scope syntax [\#639](https://github.com/voxpupuli/puppet-r10k/pull/639) ([smortex](https://github.com/smortex))
- Update ordering on webhook and docu [\#638](https://github.com/voxpupuli/puppet-r10k/pull/638) ([tuxmea](https://github.com/tuxmea))

**Merged pull requests:**

- puppet/systemd: Allow 7.x [\#656](https://github.com/voxpupuli/puppet-r10k/pull/656) ([bastelfreak](https://github.com/bastelfreak))

## [v12.2.0](https://github.com/voxpupuli/puppet-r10k/tree/v12.2.0) (2023-10-05)

[Full Changelog](https://github.com/voxpupuli/puppet-r10k/compare/v12.1.1...v12.2.0)
Expand Down
24 changes: 0 additions & 24 deletions Dockerfile

This file was deleted.

8 changes: 3 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ group :test do
gem 'voxpupuli-test', '~> 7.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'puppet_metadata', '~> 3.0', :require => false
gem 'puppet_metadata', '~> 3.5', :require => false
end

group :development do
Expand All @@ -16,13 +16,11 @@ group :development do
end

group :system_tests do
gem 'voxpupuli-acceptance', '~> 2.0', :require => false
gem 'voxpupuli-acceptance', '~> 3.0', :require => false
end

group :release do
gem 'github_changelog_generator', '>= 1.16.1', :require => false
gem 'voxpupuli-release', '~> 3.0', :require => false
gem 'faraday-retry', '~> 2.1', :require => false
gem 'voxpupuli-release', '~> 3.0', :require => false
end

gem 'rake', :require => false
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ servers at time of push in git. More modern git systems use webhooks, for those
The mcollective agent can be configured to supply r10k/git environment `http_proxy`, `https_proxy` variables via the following example

```puppet
class { '::r10k::mcollective':
class { 'r10k::mcollective':
http_proxy => 'http://proxy.example.lan:3128',
git_ssl_no_verify => 1,
}
Expand Down Expand Up @@ -539,7 +539,7 @@ class { 'r10k::webhook':
To aid in debugging, or to give you some hints as to how to trigger the webhook by unsupported systems, here's a curl command to trigger the webhook to deploy the 'production' environment:

```bash
curl -d '
curl --header "X-Gitlab-Event: Push Hook" -d '
{
"repository": {"name": "foo", "owner": {"login": "foo"}},
"ref": "production"
Expand All @@ -549,7 +549,7 @@ curl -d '
If you are utilizing environment prefixes, you'll need to specify the full environment title (including the prefix) in the 'ref' parameter:

```bash
curl -d '
curl --header "X-Gitlab-Event: Push Hook" -d '
{
"repository": {"name": "bar", "owner": {"login": "foo"}},
"ref": "bar_production"
Expand Down
Loading