Skip to content

Commit

Permalink
Add Puppet 6 support
Browse files Browse the repository at this point in the history
  • Loading branch information
ekohl authored and mmoll committed Dec 18, 2018
1 parent 9e0286c commit 1a42042
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
9 changes: 9 additions & 0 deletions .fixtures.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
fixtures:
repositories:
apt: 'https://github.com/puppetlabs/puppetlabs-apt'
augeas_core:
repo: 'https://github.com/puppetlabs/puppetlabs-augeas_core'
puppet_version: '>= 6.0.0'
concat: 'https://github.com/puppetlabs/puppetlabs-concat'
cron_core:
repo: "https://github.com/puppetlabs/puppetlabs-cron_core"
puppet_version: ">= 6.0.0"
datacat: 'https://github.com/richardc/puppet-datacat'
dhcp: 'https://github.com/theforeman/puppet-dhcp'
dns: 'https://github.com/theforeman/puppet-dns'
Expand All @@ -13,3 +19,6 @@ fixtures:
systemd: 'https://github.com/camptocamp/puppet-systemd'
tftp: 'https://github.com/theforeman/puppet-tftp'
xinetd: 'https://github.com/puppetlabs/puppetlabs-xinetd'
yumrepo_core:
repo: "https://github.com/puppetlabs/puppetlabs-yumrepo_core"
puppet_version: ">= 6.0.0"
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,32 @@ matrix:
env: PUPPET_VERSION=5.0
- rvm: 2.5.1
env: PUPPET_VERSION=5.0
- rvm: 2.5.1
env: PUPPET_VERSION=6.0
# Acceptance tests
- rvm: 2.5.1
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=centos7-64{hypervisor=docker\,hostname=centos7-64.example.com}
script: bundle exec rake beaker
services: docker
bundler_args: --without development
- rvm: 2.5.1
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=centos7-64{hypervisor=docker\,hostname=centos7-64.example.com}
script: bundle exec rake beaker
services: docker
bundler_args: --without development
- rvm: 2.5.1
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker\,hostname=debian9-64.example.com}
script: bundle exec rake beaker
services: docker
bundler_args: --without development
- rvm: 2.5.1
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker\,hostname=debian9-64.example.com}
script: bundle exec rake beaker
services: docker
bundler_args: --without development
bundler_args: --without system_tests development
sudo: false
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 4.6.1 < 6.0.0"
"version_requirement": ">= 4.6.1 < 7.0.0"
}
],
"operatingsystem_support": [
Expand Down

0 comments on commit 1a42042

Please sign in to comment.