diff --git a/.fixtures.yml b/.fixtures.yml index 57f4755e..6f88de00 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -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' @@ -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" diff --git a/.travis.yml b/.travis.yml index 32e87934..722e27df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,8 @@ 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 @@ -24,11 +26,23 @@ matrix: 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 diff --git a/metadata.json b/metadata.json index f297acdf..554865e7 100644 --- a/metadata.json +++ b/metadata.json @@ -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": [