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 Puppet 5 and 6 and update module dependency versions #5

Merged
merged 1 commit into from
May 14, 2019
Merged

Support Puppet 5 and 6 and update module dependency versions #5

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
3 changes: 3 additions & 0 deletions .fixtures.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@ fixtures:
epel: https://github.com/stahnma/puppet-module-epel.git
inifile: https://github.com/puppetlabs/puppetlabs-inifile.git
firewall: https://github.com/puppetlabs/puppetlabs-firewall.git
yumrepo_core:
repo: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
puppet_version: ">= 6.0.0"
symlinks:
globus: "#{source_dir}"
24 changes: 18 additions & 6 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,33 @@ script: bundle exec rake release_checks
matrix:
fast_finish: true
include:
- rvm: 2.1.8
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
- rvm: 2.4.4
env: PUPPET_GEM_VERSION="~> 5.0" STRICT_VARIABLES="yes"
- rvm: 2.5.1
env: PUPPET_GEM_VERSION="~> 6.0" STRICT_VARIABLES="yes"
- rvm: 2.4.4
sudo: required
services: docker
env: BEAKER_set="centos-6-x64-docker"
env: BEAKER_set="centos-6-x64-docker" BEAKER_PUPPET_COLLECTION=puppet5
bundler_args:
script: sudo service docker restart ; sleep 10 ; bundle exec rake beaker
script: bundle exec rake beaker
- rvm: 2.4.4
sudo: required
services: docker
env: BEAKER_set="centos-7-x64-docker"
env: BEAKER_set="centos-6-x64-docker" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: sudo service docker restart ; sleep 10 ; bundle exec rake beaker
script: bundle exec rake beaker
- rvm: 2.4.4
sudo: required
services: docker
env: BEAKER_set="centos-7-x64-docker" BEAKER_PUPPET_COLLECTION=puppet5
bundler_args:
script: bundle exec rake beaker
- rvm: 2.4.4
sudo: required
services: docker
env: BEAKER_set="centos-7-x64-docker" BEAKER_PUPPET_COLLECTION=puppet6
bundler_args:
script: bundle exec rake beaker
notifications:
email: false
6 changes: 3 additions & 3 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
}
],
"dependencies": [
{ "name": "puppetlabs/stdlib", "version_requirement": ">= 4.13.1 <5.0.0" },
{ "name": "puppetlabs/inifile", "version_requirement": ">= 1.0.0 <2.0.0" },
{ "name": "puppetlabs/stdlib", "version_requirement": ">= 4.13.1 <6.0.0" },
{ "name": "puppetlabs/inifile", "version_requirement": ">= 1.0.0 <4.0.0" },
{ "name": "puppetlabs/firewall", "version_requirement": ">= 1.0.0 <2.0.0" },
{ "name": "stahnma/epel", "version_requirement": ">= 1.0.0 <2.0.0" }
],
"requirements": [
{"name": "puppet", "version_requirement": ">= 4.7.0 < 6.0.0" }
{"name": "puppet", "version_requirement": ">= 5.0.0 < 7.0.0" }
]
}