3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -14,5 +13,7 @@ matrix:
include:
- rvm: 2.4.1
env: PUPPET_VERSION=5.0
- rvm: 2.5.1
env: PUPPET_VERSION=5.0
bundler_args: --without system_tests development
sudo: false
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
# Changelog

## [4.1.0](https://github.com/theforeman/puppet-git/tree/4.1.0) (2018-07-16)

[Full Changelog](https://github.com/theforeman/puppet-git/compare/4.0.0...4.1.0)

**Implemented enhancements:**

- Support Ubuntu/bionic, drop Fedora 25 & Debian 7 [\#39](https://github.com/theforeman/puppet-git/pull/39) ([mmoll](https://github.com/mmoll))

## [4.0.0](https://github.com/theforeman/puppet-git/tree/4.0.0) (2018-01-25)

[Full Changelog](https://github.com/theforeman/puppet-git/compare/3.0.0...4.0.0)

**Breaking changes:**
Expand Down
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]}
Expand Down
25 changes: 25 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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}'

Expand Down
7 changes: 3 additions & 4 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "theforeman-git",
"version": "4.0.0",
"version": "4.1.0",
"author": "theforeman",
"summary": "git installation and configuration",
"license": "GPL-3.0+",
Expand Down Expand Up @@ -49,14 +49,12 @@
{
"operatingsystem": "Fedora",
"operatingsystemrelease": [
"25",
"26"
]
},
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"7",
"8",
"9"
]
Expand All @@ -65,7 +63,8 @@
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"14.04",
"16.04"
"16.04",
"18.04"
]
},
{
Expand Down
20 changes: 0 additions & 20 deletions spec/acceptance/nodesets/docker/centos-6.yml

This file was deleted.

19 changes: 0 additions & 19 deletions spec/acceptance/nodesets/docker/centos-7.yml

This file was deleted.

20 changes: 0 additions & 20 deletions spec/acceptance/nodesets/docker/debian-8.yml

This file was deleted.

20 changes: 0 additions & 20 deletions spec/acceptance/nodesets/docker/debian-9.yml

This file was deleted.

21 changes: 0 additions & 21 deletions spec/acceptance/nodesets/docker/ubuntu-14.04.yml

This file was deleted.

19 changes: 0 additions & 19 deletions spec/acceptance/nodesets/docker/ubuntu-16.04.yml

This file was deleted.