Showing with 14 additions and 25 deletions.
  1. +1 −14 .travis.yml
  2. +9 −0 CHANGELOG.md
  3. +1 −1 Gemfile
  4. +0 −2 data/Ubuntu-12.04.yaml
  5. +0 −2 data/Ubuntu-14.04.yaml
  6. +2 −4 metadata.json
  7. +1 −2 spec/classes/init_spec.rb
15 changes: 1 addition & 14 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,11 @@
---
# This file is managed centrally by modulesync
# https://github.com/theforeman/foreman-installer-modulesync
rvm:
- 2.1.9
- 2.3.0
- 2.4.1
env:
matrix:
- PUPPET_VERSION=4.9
matrix:
fast_finish: true
include:
- rvm: 2.4.1
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
Expand Down Expand Up @@ -107,8 +98,4 @@ matrix:
- sudo service docker restart

bundler_args: --without system_tests development
before_install:
- if [ $TRAVIS_RUBY_VERSION = 2.1.9 ] ; then
gem install -v 1.17.3 bundler --no-rdoc --no-ri;
fi
sudo: false
dist: xenial
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Changelog

## [5.0.0](https://github.com/theforeman/puppet-tftp/tree/5.0.0) (2019-04-15)

[Full Changelog](https://github.com/theforeman/puppet-tftp/compare/4.4.0...5.0.0)

**Breaking changes:**

- drop Puppet 4 [\#93](https://github.com/theforeman/puppet-tftp/pull/93) ([mmoll](https://github.com/mmoll))
- drop EOL OSes [\#92](https://github.com/theforeman/puppet-tftp/pull/92) ([mmoll](https://github.com/mmoll))

## [4.4.0](https://github.com/theforeman/puppet-tftp/tree/4.4.0) (2019-01-10)

[Full Changelog](https://github.com/theforeman/puppet-tftp/compare/4.3.0...4.4.0)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

source 'https://rubygems.org'

gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '>= 4.6'
gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '>= 5.5'

gem 'rake'
gem 'rspec', '~> 3.0'
Expand Down
2 changes: 0 additions & 2 deletions data/Ubuntu-12.04.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions data/Ubuntu-14.04.yaml

This file was deleted.

6 changes: 2 additions & 4 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "theforeman-tftp",
"version": "4.4.0",
"version": "5.0.0",
"author": "theforeman",
"summary": "TFTP server configuration",
"license": "GPL-3.0+",
Expand All @@ -26,7 +26,7 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 4.9.0 < 7.0.0"
"version_requirement": ">= 5.5.8 < 7.0.0"
}
],
"operatingsystem_support": [
Expand Down Expand Up @@ -67,15 +67,13 @@
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"14.04",
"16.04",
"18.04"
]
},
{
"operatingsystem": "FreeBSD",
"operatingsystemrelease": [
"10",
"11"
]
},
Expand Down
3 changes: 1 addition & 2 deletions spec/classes/init_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
.with_ensure('installed')
.with_alias('tftp-server')

if facts[:operatingsystem] == 'Debian' ||
(facts[:operatingsystem] == 'Ubuntu' && facts[:operatingsystemrelease].to_i >= 16)
if facts[:operatingsystem] == 'Debian' || facts[:operatingsystem] == 'Ubuntu'
should contain_package('pxelinux').with_ensure('installed')
should contain_package('syslinux-common').with_ensure('installed')
else
Expand Down