Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

puppetlabs/stdlib: Require 9.x #325

Merged
merged 3 commits into from Jun 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/CONTRIBUTING.md
Expand Up @@ -232,18 +232,21 @@ simple tests against it after applying the module. You can run this
with:

```sh
BEAKER_setfile=debian11-64 bundle exec rake beaker
BEAKER_PUPPET_COLLECTION=puppet7 BEAKER_setfile=debian11-64 bundle exec rake beaker
```

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

* ubuntu1804
* ubuntu2004
* debian10
* ubuntu2204
* debian11
* centos7
* centos8
* centos9
* almalinux8
* almalinux9
* fedora36

For more information and tips & tricks, see [voxpupuli-acceptance's documentation](https://github.com/voxpupuli/voxpupuli-acceptance#running-tests).

Expand Down
2 changes: 1 addition & 1 deletion .msync.yml
Expand Up @@ -2,4 +2,4 @@
# Managed by modulesync - DO NOT EDIT
# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/

modulesync_config_version: '5.5.0'
modulesync_config_version: '6.0.0'
2 changes: 0 additions & 2 deletions .sync.yml
Expand Up @@ -3,8 +3,6 @@ Gemfile:
optional:
':test':
- gem: 'toml'
spec/spec_helper_acceptance.rb:
unmanaged: false
.puppet-lint.rc:
enabled_lint_checks:
- parameter_types
Expand Down
13 changes: 7 additions & 6 deletions Gemfile
Expand Up @@ -4,10 +4,10 @@
source ENV['GEM_SOURCE'] || 'https://rubygems.org'

group :test do
gem 'voxpupuli-test', '~> 5.4', :require => false
gem 'voxpupuli-test', '~> 6.0', :require => false
gem 'coveralls', :require => false
gem 'simplecov-console', :require => false
gem 'puppet_metadata', '~> 2.0', :require => false
gem 'puppet_metadata', '~> 3.0', :require => false
gem 'toml', :require => false
end

Expand All @@ -17,18 +17,19 @@ group :development do
end

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

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

gem 'rake', :require => false
gem 'facter', ENV['FACTER_GEM_VERSION'], :require => false, :groups => [:test]

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

# vim: syntax=ruby
2 changes: 1 addition & 1 deletion metadata.json
Expand Up @@ -75,7 +75,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 7.0.0 < 8.0.0"
"version_requirement": ">= 7.0.0 < 9.0.0"
}
],
"tags": [
Expand Down
3 changes: 0 additions & 3 deletions spec/acceptance/class_spec.rb
Expand Up @@ -7,9 +7,6 @@
# Create dummy module directorty
shell('mkdir -p /etc/puppetlabs/code/environments/production/modules/my_custom_module/files/dashboards')
context 'default parameters' do
before do
install_module_from_forge('puppetlabs/apt', '>= 9.1.0 < 10.0.0')
end
# Using puppet_apply as a helper

it 'works idempotently with no errors' do
Expand Down
7 changes: 6 additions & 1 deletion spec/spec_helper_acceptance.rb
Expand Up @@ -5,6 +5,11 @@

require 'voxpupuli/acceptance/spec_helper_acceptance'

configure_beaker
configure_beaker do |host|
case fact('os.family')
when 'Debian'
install_puppet_module_via_pmt_on(host, 'puppetlabs-apt')
end
end

Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }
2 changes: 1 addition & 1 deletion templates/pdashboards.yaml.epp
@@ -1,3 +1,3 @@
# This file is managed by Puppet, any changes will be overwritten

<%= to_yaml($grafana::config::pdashboards) -%>
<%= stdlib::to_yaml($grafana::config::pdashboards) -%>
2 changes: 1 addition & 1 deletion templates/pdatasources.yaml.epp
@@ -1,3 +1,3 @@
# This file is managed by Puppet, any changes will be overwritten

<%= to_yaml($grafana::config::pdatasources) -%>
<%= stdlib::to_yaml($grafana::config::pdatasources) -%>