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.

Sign up for GitHub

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

Support stdlib 5.x #1003

Merged
merged 1 commit into from
Oct 29, 2018
Merged

Support stdlib 5.x #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .fixtures-puppet6.yml → .fixtures-latest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@ fixtures:
repositories:
apt:
repo: git://github.com/puppetlabs/puppetlabs-apt.git
ref: 4.1.0
ref: 6.1.1
yumrepo_core:
repo: git://github.com/puppetlabs/puppetlabs-yumrepo_core
ref: 1.0.1
puppet_version: ">= 6.0.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's this? I haven't seen this before.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's new with 2.11.0:

puppetlabs/puppetlabs_spec_helper#258

stdlib:
repo: git://github.com/puppetlabs/puppetlabs-stdlib.git
ref: 4.24.0
ref: 5.1.0
remote_file:
repo: git://github.com/lwf/puppet-remote_file.git
ref: v1.1.3
powershell:
repo: git://github.com/puppetlabs/puppetlabs-powershell.git
ref: 2.1.0
ref: 2.1.5
symlinks:
sensu: "#{source_dir}"
4 changes: 4 additions & 0 deletions .fixtures.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ fixtures:
apt:
repo: git://github.com/puppetlabs/puppetlabs-apt.git
ref: 4.1.0
yumrepo_core:
repo: git://github.com/puppetlabs/puppetlabs-yumrepo_core
ref: 1.0.1
puppet_version: ">= 6.0.0"
stdlib:
repo: git://github.com/puppetlabs/puppetlabs-stdlib.git
ref: 4.24.0
Expand Down
6 changes: 5 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,12 @@ matrix:
include:
- rvm: 2.4.4
env: PUPPET_GEM_VERSION="~> 5"
- rvm: 2.4.4
env: PUPPET_GEM_VERSION="~> 5" FIXTURES_YML=".fixtures-latest.yml"
- rvm: 2.5.1
env: PUPPET_GEM_VERSION="~> 6"
- rvm: 2.5.1
env: PUPPET_GEM_VERSION="~> 6" FIXTURES_YML=".fixtures-puppet6.yml"
env: PUPPET_GEM_VERSION="~> 6" FIXTURES_YML=".fixtures-latest.yml"
- rvm: 2.4.4
sudo: required
services: docker
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ group :development, :unit_tests do
gem 'rake', '< 11.0.0'
gem 'rspec-puppet', '~> 2.6.0', :require => false
gem 'rspec-mocks', :require => false
gem 'puppetlabs_spec_helper', '>= 2.7.0', :require => false
gem 'puppetlabs_spec_helper', '>= 2.11.0', :require => false
gem 'puppet-lint', "~> 2.0", :require => false
gem 'json', "~> 1.8.3", :require => false
gem 'json_pure', "~> 1.8.3", :require => false
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
},
{
"name": "puppetlabs/stdlib",
"version_requirement": ">=4.24.0 <5.0.0"
"version_requirement": ">=4.24.0 <6.0.0"
}
]
}
12 changes: 8 additions & 4 deletions spec/classes/sensu_package_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@
:os => {
:name => 'ubuntu',
:release => {
:full => '14.04'
:full => '14.04',
:major => '14',
},
:distro => {
:codename => 'trusty',
Expand Down Expand Up @@ -204,7 +205,8 @@
:os => {
:name => 'Debian',
:release => {
:full => '8.6',
:full => '8.6',
:major => '8',
},
:distro => {
:codename => 'jessie',
Expand Down Expand Up @@ -236,7 +238,8 @@
:os => {
:name => 'Debian',
:release => {
:full => '9.3',
:full => '9.3',
:major => '9',
},
:distro => {
:codename => 'stretch',
Expand Down Expand Up @@ -268,7 +271,8 @@
:os => {
:name => 'Debian',
:release => {
:full => '9.3',
:full => '9.3',
:major => '9',
},
:distro => {
:codename => 'wheezy',
Expand Down