.sync.yml

@@ -1,9 +1,9 @@
 ---
 .travis.yml:
   beaker_sets:
-    - docker/centos-7
-    - docker/debian-8
-    - docker/debian-9
+    - centos7-64
+    - debian8-64
+    - debian9-64
 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:
@@ -14,22 +13,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=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.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=puppet5 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
-    - rvm: 2.3.1
+    - rvm: 2.5.1
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/debian-9
+      env: PUPPET_INSTALL_TYPE=agent 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

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## [5.2.0](https://github.com/theforeman/puppet-dns/tree/5.2.0) (2018-05-21)
+## [5.3.0](https://github.com/theforeman/puppet-dns/tree/5.3.0) (2018-07-16)
+
+[Full Changelog](https://github.com/theforeman/puppet-dns/compare/5.2.0...5.3.0)
+
+**Implemented enhancements:**
+
+- Support Ubuntu/bionic, drop Fedora 25 [\#115](https://github.com/theforeman/puppet-dns/pull/115) ([mmoll](https://github.com/mmoll))
+
+## [5.2.0](https://github.com/theforeman/puppet-dns/tree/5.2.0) (2018-05-22)
 
 [Full Changelog](https://github.com/theforeman/puppet-dns/compare/5.1.0...5.2.0)
 

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}'
 

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-dns",
-  "version": "5.2.0",
+  "version": "5.3.0",
   "author": "theforeman",
   "summary": "Manage the ISC BIND daemon",
   "license": "Apache-2.0",
@@ -56,7 +56,6 @@
     {
       "operatingsystem": "Fedora",
       "operatingsystemrelease": [
-        "25",
         "26"
       ]
     },
@@ -71,7 +70,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "14.04",
-        "16.04"
+        "16.04",
+        "18.04"
       ]
     },
     {

spec/acceptance/views_spec.rb

@@ -67,7 +67,10 @@ class {'::dns':
     end
 
     describe command('dig +short SOA example.com @::1') do
-      its(:stdout) { is_expected.to match("ns1-v6.example.com. root.example.com. 1 86400 3600 604800 3600\n") }
+      its(:stdout) do
+        pending("IPv6 support in docker containers on Travis is broken") if ENV['TRAVIS'] == 'true'
+        is_expected.to match("ns1-v6.example.com. root.example.com. 1 86400 3600 604800 3600\n")
+      end
     end
   end
 end