.sync.yml

@@ -1,12 +1,14 @@
 ---
 .travis.yml:
   beaker_sets:
-    - docker/centos-7
-    - docker/centos-6
-    - docker/debian-8
+    - centos7-64
+    - centos6-64
+    - debian8-64
   env:
     global:
       - PARALLEL_TEST_PROCESSORS=8
+  # Some upgrade tests rely on PC1 version numbers
+  beaker_puppet_collection: pc1
 Rakefile:
   param_docs_pattern:
     - manifests/init.pp

.travis.yml

@@ -3,7 +3,6 @@
 #   https://github.com/theforeman/foreman-installer-modulesync
 rvm:
   - 2.1.9
-  - 2.2.6
   - 2.3.0
   - 2.4.1
 env:
@@ -16,22 +15,24 @@ matrix:
   include:
     - rvm: 2.4.1
       env: PUPPET_VERSION=5.0
+    - rvm: 2.5.1
+      env: PUPPET_VERSION=5.0
     # Acceptance tests
-    - rvm: 2.3.1
+    - rvm: 2.5.1
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
+      env: PUPPET_INSTALL_TYPE=agent 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.3.1
+    - rvm: 2.5.1
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-6
+      env: PUPPET_INSTALL_TYPE=agent 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.3.1
+    - rvm: 2.5.1
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/debian-8
+      env: PUPPET_INSTALL_TYPE=agent 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,21 @@
 # Changelog
 
+## [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)
+
+**Implemented enhancements:**
+
+- Support Ubuntu/bionic, drop Debian 7 & Fedora 25 [\#605](https://github.com/theforeman/puppet-puppet/pull/605) ([mmoll](https://github.com/mmoll))
+
+## [9.0.3](https://github.com/theforeman/puppet-puppet/tree/9.0.3) (2018-06-20)
+
+[Full Changelog](https://github.com/theforeman/puppet-puppet/compare/9.0.1...9.0.3)
+
+**Fixed bugs:**
+
+- make foreman puppet module dir optional [\#600](https://github.com/theforeman/puppet-puppet/pull/600) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [9.0.1](https://github.com/theforeman/puppet-puppet/tree/9.0.1) (2018-06-13)
 
 [Full Changelog](https://github.com/theforeman/puppet-puppet/compare/9.0.0...9.0.1)
@@ -8,7 +24,7 @@
 
 - Support ssl-protocols option for puppetserver configuration [\#598](https://github.com/theforeman/puppet-puppet/pull/598) ([stbenjam](https://github.com/stbenjam))
 
-## [9.0.0](https://github.com/theforeman/puppet-puppet/tree/9.0.0) (2018-05-07)
+## [9.0.0](https://github.com/theforeman/puppet-puppet/tree/9.0.0) (2018-05-29)
 
 [Full Changelog](https://github.com/theforeman/puppet-puppet/compare/8.2.0...9.0.0)
 
@@ -25,8 +41,8 @@
 
 **Fixed bugs:**
 
+- Allow arrays for `server\_jvm\_extra\_args` parameter [\#596](https://github.com/theforeman/puppet-puppet/pull/596) ([alexjfisher](https://github.com/alexjfisher))
 - Use the correct Stdlib::HTTPUrl [\#584](https://github.com/theforeman/puppet-puppet/pull/584) ([ekohl](https://github.com/ekohl))
-- Allow arrays for `server_jvm_extra_args` parameter [\#596](https://github.com/theforeman/puppet-puppet/pull/596) ([alexjfisher](https://github.com/alexjfisher))
 
 **Merged pull requests:**
 
@@ -36,6 +52,7 @@
 - Cosmetic fix to metadata.json [\#580](https://github.com/theforeman/puppet-puppet/pull/580) ([alexjfisher](https://github.com/alexjfisher))
 
 ## [8.2.0](https://github.com/theforeman/puppet-puppet/tree/8.2.0) (2018-01-25)
+
 [Full Changelog](https://github.com/theforeman/puppet-puppet/compare/8.1.0...8.2.0)
 
 **Implemented enhancements:**

Gemfile

@@ -26,8 +26,10 @@ gem 'puppet-lint-unquoted_string-check'
 gem 'puppet-lint-variable_contains_upcase'
 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-hostgenerator', '>= 1.1.10', {"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"]}

Rakefile

@@ -15,6 +15,31 @@ begin
 rescue LoadError
 end
 
+begin
+  require 'github_changelog_generator/task'
+
+  # https://github.com/github-changelog-generator/github-changelog-generator/issues/313
+  module GitHubChangelogGeneratorExtensions
+    def compound_changelog
+      super.gsub(/(fixes|fixing|refs) \\#(\d+)/i, '\1 [\\#\2](https://projects.theforeman.org/issues/\2)')
+    end
+  end
+
+  class GitHubChangelogGenerator::Generator
+    prepend GitHubChangelogGeneratorExtensions
+  end
+
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
+    metadata = JSON.load(File.read('metadata.json'))
+    config.user = metadata['author']
+    config.project = "puppet-#{metadata['name'].split('-').last}"
+    config.future_release = metadata['version']
+    config.exclude_labels = ['duplicate', 'question', 'invalid', 'wontfix', 'Modulesync', 'skip-changelog']
+  end
+rescue LoadError
+end
+
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp", "vendor/**/*.pp"]
 PuppetLint.configuration.log_format = '%{path}:%{line}:%{KIND}: %{message}'
 

manifests/params.pp

@@ -329,10 +329,7 @@
   case $::osfamily {
     'Debian' : {
       $agent_restart_command = "/usr/sbin/service ${service_name} reload"
-      if (
-        ($::operatingsystem == 'Debian') and (versioncmp($::operatingsystemrelease, '8.0') >= 0) or
-        ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemrelease, '15.04') >= 0)
-      ) {
+      if ($::operatingsystem == 'Debian' or $::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '15.04') >= 0) {
         $unavailable_runmodes = []
       } else {
         $unavailable_runmodes = ['systemd.timer']

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-puppet",
-  "version": "9.0.3",
+  "version": "9.1.0",
   "author": "theforeman",
   "summary": "Puppet agent and server configuration",
   "license": "GPL-3.0+",
@@ -71,14 +71,12 @@
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [
-        "25",
         "26"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
@@ -87,7 +85,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "14.04",
-        "16.04"
+        "16.04",
+        "18.04"
       ]
     },
     {

spec/classes/puppet_agent_service_spec.rb

@@ -23,7 +23,7 @@
           should contain_class('puppet::agent::service::cron').with(:enabled => false)
         end
         case os
-        when /\Adebian-(8|9)/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-16/, /\Aarchlinux-/
+        when /\Adebian-/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-(16|18)/, /\Aarchlinux-/
           it do
             should contain_class('puppet::agent::service::systemd').with(:enabled => false)
             should contain_service('puppet-run.timer').with(:ensure => :stopped)
@@ -45,7 +45,7 @@
           it do
             should raise_error(Puppet::Error, /Runmode of cron not supported on #{facts[:kernel]} operating systems!/)
           end
-        when /\Adebian-(8|9)/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-16/
+        when /\Adebian-/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-(16|18)/
           it do
             should contain_class('puppet::agent::service::cron').with(:enabled => true)
             should contain_class('puppet::agent::service::daemon').with(:enabled => false)
@@ -67,7 +67,7 @@
           "class {'puppet': agent => true, runmode => 'systemd.timer'}"
         end
         case os
-        when /\Adebian-(8|9)/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-16/, /\Aarchlinux-/
+        when /\Adebian-/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-(16|18)/, /\Aarchlinux-/
           it do
             should contain_class('puppet::agent::service::daemon').with(:enabled => false)
             should contain_class('puppet::agent::service::cron').with(:enabled => false)
@@ -99,7 +99,7 @@
           should contain_class('puppet::agent::service::cron').with(:enabled => false)
         end
         case os
-        when /\Adebian-(8|9)/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-16/, /\Aarchlinux-/
+        when /\Adebian-/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-(16|18)/, /\Aarchlinux-/
           it do
             should contain_class('puppet::agent::service::systemd').with(:enabled => false)
             should contain_service('puppet-run.timer').with(:ensure => :stopped)

spec/classes/puppet_agent_service_systemd_spec.rb

@@ -24,7 +24,7 @@
         end
 
         case os
-        when /\Adebian-(8|9)/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-16/, /\Aarchlinux-/
+        when /\Adebian-/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-(16|18)/, /\Aarchlinux-/
           it 'should disable systemd timer' do
             should contain_class('puppet::agent::service::systemd').with({
               'enabled' => false,
@@ -61,7 +61,7 @@
         end
 
         case os
-        when /\Adebian-(8|9)/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-16/, /\Aarchlinux-/
+        when /\Adebian-/, /\A(redhat|centos|scientific)-7/, /\Afedora-/, /\Aubuntu-(16|18)/, /\Aarchlinux-/
           it 'should enable systemd timer' do
             should contain_class('puppet::agent::service::systemd').with_enabled(true)