Skip to content

Commit

Permalink
Merge pull request #61 from voxpupuli/modulesync
Browse files Browse the repository at this point in the history
modulesync 9.3.0
  • Loading branch information
bastelfreak authored Sep 20, 2024
2 parents 967ac85 + 125104a commit 8829a50
Show file tree
Hide file tree
Showing 26 changed files with 117 additions and 89 deletions.
6 changes: 0 additions & 6 deletions .devcontainer/Dockerfile

This file was deleted.

35 changes: 0 additions & 35 deletions .devcontainer/README.md

This file was deleted.

17 changes: 0 additions & 17 deletions .devcontainer/devcontainer.json

This file was deleted.

12 changes: 10 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,15 +245,23 @@ with:
BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
```

or

```sh
BEAKER_PUPPET_COLLECTION=none BEAKER_setfile=archlinux-64 bundle exec rake beaker
```

This latter example will use the distribution's own version of Puppet.

You can replace the string `debian11` with any common operating system.
The following strings are known to work:

* ubuntu2004
* ubuntu2204
* debian11
* centos7
* centos8
* debian12
* centos9
* archlinux
* almalinux8
* almalinux9
* fedora36
Expand Down
3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
---
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

skip-changelog:
- head-branch: ['^release-*', 'release']
42 changes: 42 additions & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes

changelog:
exclude:
labels:
- duplicate
- invalid
- modulesync
- question
- skip-changelog
- wont-fix
- wontfix

categories:
- title: Breaking Changes 🛠
labels:
- backwards-incompatible

- title: New Features 🎉
labels:
- enhancement

- title: Bug Fixes 🐛
labels:
- bug

- title: Documentation Updates 📚
labels:
- documentation
- docs

- title: Dependency Updates ⬆️
labels:
- dependencies

- title: Other Changes
labels:
- "*"
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

name: CI

# yamllint disable-line rule:truthy
on:
pull_request: {}
push:
Expand All @@ -18,4 +19,4 @@ concurrency:
jobs:
puppet:
name: Puppet
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2
uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v3
18 changes: 18 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

name: "Pull Request Labeler"

# yamllint disable-line rule:truthy
on:
pull_request_target: {}

jobs:
labeler:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- uses: actions/labeler@v5
10 changes: 9 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

name: Release

# yamllint disable-line rule:truthy
on:
push:
tags:
Expand All @@ -12,11 +13,18 @@ on:
jobs:
release:
name: Release
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v2
uses: voxpupuli/gha-puppet/.github/workflows/release.yml@v3
with:
allowed_owner: 'voxpupuli'
secrets:
# Configure secrets here:
# https://docs.github.com/en/actions/security-guides/encrypted-secrets
username: ${{ secrets.PUPPET_FORGE_USERNAME }}
api_key: ${{ secrets.PUPPET_FORGE_API_KEY }}

create-github-release:
name: Create GitHub Release
runs-on: ubuntu-latest
steps:
- name: Create GitHub release
uses: voxpupuli/gha-create-a-github-release@v1
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: '9.0.0'
modulesync_config_version: '9.3.0'
1 change: 1 addition & 0 deletions .pmtignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
/.github/
/.librarian/
/Puppetfile.lock
/Puppetfile
*.iml
/.editorconfig
/.fixtures.yml
Expand Down
3 changes: 3 additions & 0 deletions .puppet-lint.rc
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

--fail-on-warnings
1 change: 1 addition & 0 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
- parameter_types
spec/spec_helper.rb:
hiera_config: "'spec/fixtures/hiera/hiera.yaml'"
facterdb_string_keys: true
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

group :test do
gem 'voxpupuli-test', '~> 8.0', :require => false
gem 'voxpupuli-test', '~> 9.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'puppet_metadata', '~> 4.0', :require => false
Expand All @@ -26,7 +26,7 @@ end
gem 'rake', :require => false
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]

puppetversion = ENV['PUPPET_GEM_VERSION'] || '~> 7.24'
puppetversion = ENV['PUPPET_GEM_VERSION'] || [">= 7.24", "< 9"]
gem 'puppet', puppetversion, :require => false, :groups => [:test]

# vim: syntax=ruby
4 changes: 2 additions & 2 deletions spec/classes/varnish_firewall_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
require 'spec_helper'

describe 'varnish::firewall', type: :class do
on_supported_os.each do |os, facts|
on_supported_os.each do |os, os_facts|
context "on #{os}" do
let :facts do
facts
os_facts
end

context 'default values' do
Expand Down
4 changes: 2 additions & 2 deletions spec/classes/varnish_install_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
require 'spec_helper'

describe 'varnish::install', type: :class do
on_supported_os.each do |os, facts|
on_supported_os.each do |os, os_facts|
context "on #{os}" do
let :facts do
facts
os_facts
end

context 'default values' do
Expand Down
4 changes: 2 additions & 2 deletions spec/classes/varnish_ncsa_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
'include varnish'
end

on_supported_os.each do |os, facts|
on_supported_os.each do |os, os_facts|
context "on #{os}" do
let :facts do
facts
os_facts
end

context 'default values' do
Expand Down
2 changes: 1 addition & 1 deletion spec/classes/varnish_repo_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

it { is_expected.to compile }

case os_facts[:osfamily]
case os_facts['os']['family']
when 'Debian'
it {
is_expected.to contain_apt__source('varnish').with(
Expand Down
6 changes: 3 additions & 3 deletions spec/classes/varnish_shmlog_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
require 'spec_helper'

describe 'varnish::shmlog', type: :class do
on_supported_os.each do |os, facts|
on_supported_os.each do |os, os_facts|
context "on #{os}" do
let :facts do
facts
os_facts
end

context 'default values' do
Expand All @@ -19,7 +19,7 @@
)
}

if facts[:os]['selinux']['enabled'] == true
if os_facts['os']['selinux']['enabled'] == true
it {
is_expected.to contain_mount('shmlog-mount').with(
'target' => '/etc/fstab',
Expand Down
8 changes: 4 additions & 4 deletions spec/classes/varnish_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
require 'spec_helper'

describe 'varnish', type: :class do
on_supported_os.each do |os, facts|
on_supported_os.each do |os, os_facts|
context "on #{os}" do
let :facts do
facts
os_facts
end

# Base Checks for all OS
Expand Down Expand Up @@ -67,7 +67,7 @@
)
}

if facts[:osfamily] == 'RedHat'
if os_facts['os']['family'] == 'RedHat'
it { is_expected.to contain_file('varnish-conf').without_content(%r{\s -j unix,user=vcache}) }
else
it { is_expected.to contain_file('varnish-conf').with_content(%r{\s -j unix,user=vcache}) }
Expand Down Expand Up @@ -161,7 +161,7 @@
it { is_expected.to compile }
it { is_expected.to contain_class('varnish::install').with_version('6.0.0-manual') }

if facts[:osfamily] == 'RedHat'
if os_facts['os']['family'] == 'RedHat'
it { is_expected.to contain_file('varnish-conf').without_content(%r{\s -j unix,user=vcache}) }
else
it { is_expected.to contain_file('varnish-conf').with_content(%r{\s -j unix,user=vcache}) }
Expand Down
4 changes: 2 additions & 2 deletions spec/classes/varnish_vcl_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
require 'spec_helper'

describe 'varnish::vcl', type: :class do
on_supported_os.each do |os, facts|
on_supported_os.each do |os, os_facts|
context "on #{os}" do
let :facts do
facts
os_facts
end
let :pre_condition do
'include varnish'
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/varnish_vcl_acl_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
let(:title) { 'foo' }
let(:facts) { { concat_basedir: '/dne' } }

on_supported_os.each do |os, facts|
on_supported_os.each do |os, os_facts|
context "on #{os}" do
let :facts do
facts
os_facts
end

let(:params) { { hosts: ['192.168.10.14'] } }
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/varnish_vcl_backend_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
]
end

on_supported_os.each do |os, facts|
on_supported_os.each do |os, os_facts|
context "on #{os}" do
let :facts do
facts
os_facts
end

let(:title) { 'foo' }
Expand Down
4 changes: 2 additions & 2 deletions spec/defines/varnish_vcl_director_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
end
let(:title) { 'foo' }

on_supported_os.each do |os, facts|
on_supported_os.each do |os, os_facts|
context "on #{os}" do
let :facts do
facts
os_facts
end
let(:params) { { backends: ['192.168.10.14'] } }

Expand Down
Loading

0 comments on commit 8829a50

Please sign in to comment.