.fixtures.yml

@@ -1,15 +1,10 @@
 fixtures:
   repositories:
-    apache:               'https://github.com/puppetlabs/puppetlabs-apache.git'
-    concat:               'https://github.com/puppetlabs/puppetlabs-concat.git'
-    extlib:               'https://github.com/voxpupuli/puppet-extlib.git'
-    foreman:              'https://github.com/theforeman/puppet-foreman.git'
-    git:                  'https://github.com/theforeman/puppet-git.git'
-    hocon:                'https://github.com/puppetlabs/puppetlabs-hocon.git'
-    inifile:              'https://github.com/puppetlabs/puppetlabs-inifile.git'
-    puppet_authorization: 'https://github.com/puppetlabs/puppetlabs-puppet_authorization.git'
-    puppetdb:             'https://github.com/puppetlabs/puppetlabs-puppetdb.git'
-    stdlib:               'https://github.com/puppetlabs/puppetlabs-stdlib.git'
-
-  symlinks:
-    puppet: "#{source_dir}"
+    apache:   'https://github.com/puppetlabs/puppetlabs-apache.git'
+    concat:   'https://github.com/puppetlabs/puppetlabs-concat.git'
+    extlib:   'https://github.com/voxpupuli/puppet-extlib.git'
+    foreman:  'https://github.com/theforeman/puppet-foreman.git'
+    git:      'https://github.com/theforeman/puppet-git.git'
+    inifile:  'https://github.com/puppetlabs/puppetlabs-inifile.git'
+    puppetdb: 'https://github.com/puppetlabs/puppetlabs-puppetdb.git'
+    stdlib:   'https://github.com/puppetlabs/puppetlabs-stdlib.git'

.travis.yml

@@ -20,19 +20,19 @@ matrix:
     # Acceptance tests
     - rvm: 2.5.1
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=pc1 BEAKER_debug=true BEAKER_setfile=centos7-64{hypervisor=docker\,hostname=centos7-64.example.com}
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=pc1 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_PUPPET_COLLECTION=pc1 BEAKER_debug=true BEAKER_setfile=centos6-64{hypervisor=docker\,hostname=centos6-64.example.com}
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=pc1 BEAKER_debug=true BEAKER_setfile=centos6-64{hypervisor=docker\,hostname=centos6-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_PUPPET_COLLECTION=pc1 BEAKER_debug=true BEAKER_setfile=debian8-64{hypervisor=docker\,hostname=debian8-64.example.com}
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=pc1 BEAKER_debug=true BEAKER_setfile=debian8-64{hypervisor=docker\,hostname=debian8-64.example.com}
       script: bundle exec rake beaker
       services: docker
       bundler_args: --without development

CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [10.0.0](https://github.com/theforeman/puppet-puppet/tree/10.0.0) (2018-10-16)
+
+[Full Changelog](https://github.com/theforeman/puppet-puppet/compare/9.1.0...10.0.0)
+
+**Breaking changes:**
+
+- don't use pupetlabs-hocon for metrics.conf [\#622](https://github.com/theforeman/puppet-puppet/pull/622) ([mmoll](https://github.com/mmoll))
+- Revert "use puppetlabs-hocon for webserver.conf" [\#620](https://github.com/theforeman/puppet-puppet/pull/620) ([mmoll](https://github.com/mmoll))
+- Revert "use puppetlabs-hocon for product.conf" [\#618](https://github.com/theforeman/puppet-puppet/pull/618) ([mmoll](https://github.com/mmoll))
+- Revert "use puppetlabs-{hocon, puppet\_authorization} for auth.conf [\#615](https://github.com/theforeman/puppet-puppet/pull/615) ([mmoll](https://github.com/mmoll))
+
+**Implemented enhancements:**
+
+- reduce diff to Puppet distributed files [\#638](https://github.com/theforeman/puppet-puppet/pull/638) ([mmoll](https://github.com/mmoll))
+- Make `splaylimit` & `runinterval` types consistent [\#623](https://github.com/theforeman/puppet-puppet/pull/623) ([alexjfisher](https://github.com/alexjfisher))
+- add status service endpoint [\#621](https://github.com/theforeman/puppet-puppet/pull/621) ([mmoll](https://github.com/mmoll))
+- updated auth.conf for the "puppet facts upload" command \(puppetserver 5.5\) [\#619](https://github.com/theforeman/puppet-puppet/pull/619) ([slauger](https://github.com/slauger))
+- Add ability to configure custom\_trusted\_oid\_mapping.yaml [\#603](https://github.com/theforeman/puppet-puppet/pull/603) ([baurmatt](https://github.com/baurmatt))
+
+**Fixed bugs:**
+
+- Add shared gem path for Puppetserver \>= 5.3 [\#631](https://github.com/theforeman/puppet-puppet/pull/631) ([baurmatt](https://github.com/baurmatt))
+
+**Merged pull requests:**
+
+- Allow puppet/extlib 3 [\#637](https://github.com/theforeman/puppet-puppet/pull/637) ([alexjfisher](https://github.com/alexjfisher))
+- Use facter 3 facts during tests [\#636](https://github.com/theforeman/puppet-puppet/pull/636) ([alexjfisher](https://github.com/alexjfisher))
+- Contain classes [\#635](https://github.com/theforeman/puppet-puppet/pull/635) ([ekohl](https://github.com/ekohl))
+- Use `contain` instead of `anchor` pattern [\#627](https://github.com/theforeman/puppet-puppet/pull/627) ([alexjfisher](https://github.com/alexjfisher))
+- removing redundant \> character [\#626](https://github.com/theforeman/puppet-puppet/pull/626) ([attachmentgenie](https://github.com/attachmentgenie))
+- allow puppetlabs-stdlib 5.x [\#625](https://github.com/theforeman/puppet-puppet/pull/625) ([mmoll](https://github.com/mmoll))
+- allow puppetlabs-concat 5.x [\#624](https://github.com/theforeman/puppet-puppet/pull/624) ([mmoll](https://github.com/mmoll))
+
 ## [9.1.0](https://github.com/theforeman/puppet-puppet/tree/9.1.0) (2018-07-16)
 
 [Full Changelog](https://github.com/theforeman/puppet-puppet/compare/9.0.3...9.1.0)

Gemfile

@@ -12,7 +12,6 @@ gem 'rspec-puppet', '~> 2.3'
 gem 'rspec-puppet-facts', '>= 1.7'
 gem 'puppetlabs_spec_helper', '>= 2.1.1'
 gem 'puppet-lint', '>= 2'
-gem 'puppet-lint-absolute_classname-check'
 gem 'puppet-lint-classes_and_types_beginning_with_digits-check'
 gem 'puppet-lint-empty_string-check'
 gem 'puppet-lint-file_ensure-check'
@@ -28,8 +27,10 @@ gem 'puppet-lint-version_comparison-check'
 gem 'simplecov'
 gem 'github_changelog_generator', {"git"=>"https://github.com/skywinder/github-changelog-generator", "ref"=>"20ee04ba1234e9e83eb2ffb5056e23d641c7a018", "groups"=>["development"]}
 gem 'puppet-blacksmith', '>= 4.1.0', {"groups"=>["development"]}
-gem 'beaker', '>= 3.9.0', {"groups"=>["system_tests"]}
+gem 'beaker', '>= 4.0.0', {"groups"=>["system_tests"]}
+gem 'beaker-docker', {"groups"=>["system_tests"]}
 gem 'beaker-hostgenerator', '>= 1.1.10', {"groups"=>["system_tests"]}
+gem 'beaker-puppet', {"groups"=>["system_tests"]}
 gem 'beaker-rspec', {"groups"=>["system_tests"]}
 gem 'beaker-module_install_helper', {"groups"=>["system_tests"]}
 gem 'beaker-puppet_install_helper', {"groups"=>["system_tests"]}