Skip to content

Commit

Permalink
Merge pull request #240 from voxpupuli/modulesync
Browse files Browse the repository at this point in the history
modulesync 7.2.0
  • Loading branch information
bastelfreak authored Jan 30, 2024
2 parents 8003f32 + 166263b commit 7763080
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,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: 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.2.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
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
30 changes: 20 additions & 10 deletions spec/defines/generate_concat_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,27 @@
require 'spec_helper'

describe 'Rsyslog::Generate_concat', include_rsyslog: true do
let(:pre_condition) { 'include rsyslog' }
let(:title) { 'mygeneratedconcat' }
context 'default' do
let(:pre_condition) { 'include rsyslog' }
let(:title) { 'mygeneratedconcat' }

let(:params) do
{
confdir: '/etc/rsyslog.d',
target: '50-rsyslog.conf'
}
end
on_supported_os.each do |os, os_facts|
context "on #{os}" do
let :facts do
os_facts
end

let(:params) do
{
confdir: '/etc/rsyslog.d',
target: '50-rsyslog.conf'
}
end

context 'with defaults' do
it { is_expected.to contain_concat('/etc/rsyslog.d/50-rsyslog.conf').that_notifies('Service[rsyslog]') }
it 'contains rsyslog config with syslog service notification' do
is_expected.to contain_concat('/etc/rsyslog.d/50-rsyslog.conf').that_notifies('Service[rsyslog]')
end
end
end
end
end

0 comments on commit 7763080

Please sign in to comment.