.fixtures.yml

@@ -2,5 +2,3 @@ fixtures:
   repositories:
     stdlib: 'git://github.com/puppetlabs/puppetlabs-stdlib'
     xinetd: 'git://github.com/puppetlabs/puppetlabs-xinetd'
-  symlinks:
-    tftp: "#{source_dir}"

.travis.yml

@@ -18,25 +18,25 @@ matrix:
     # Acceptance tests
     - rvm: 2.5.1
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 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=puppet5 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=puppet5 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=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.5.1
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 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=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.5.1
       dist: trusty
-      env: PUPPET_INSTALL_TYPE=agent BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker\,hostname=debian9-64.example.com}
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no 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,5 +1,13 @@
 # Changelog
 
+## [4.2.1](https://github.com/theforeman/puppet-tftp/tree/4.2.1) (2018-10-04)
+
+[Full Changelog](https://github.com/theforeman/puppet-tftp/compare/4.2.0...4.2.1)
+
+**Merged pull requests:**
+
+- allow puppetlabs-stdlib 5.x [\#78](https://github.com/theforeman/puppet-tftp/pull/78) ([mmoll](https://github.com/mmoll))
+
 ## [4.2.0](https://github.com/theforeman/puppet-tftp/tree/4.2.0) (2018-07-16)
 
 [Full Changelog](https://github.com/theforeman/puppet-tftp/compare/4.1.0...4.2.0)
@@ -86,3 +94,6 @@
 * Puppet 2.6 support deprecated
 * Cleanup of manifest style
 * Add tests
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Gemfile

@@ -28,8 +28,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"]}

HISTORY.md

@@ -0,0 +1,56 @@
+## 3.0.2
+* Allow puppetlabs/xinetd 3.0.0
+* Set the service for the Red Hat OS family
+
+## 3.0.1
+* Fix `invalid byte sequence in UTF-8` error
+
+## 3.0.0
+* Drop Puppet 3 support
+* Add handling for some buggy PXE stacks
+
+## 2.0.0
+* Drop support for Ruby 1.8.7
+
+## 1.8.2
+* Fix strict variables compatibility on Arch Linux
+
+## 1.8.1
+* Mark compatibility with puppetlabs/xinetd 2.x
+
+## 1.8.0
+* Add support for Archlinux
+* Add package, syslinux_package parameters to override package names
+* Fix service resource provider under Ubuntu 16.04
+
+## 1.7.0
+* Add support for Ubuntu 16.04
+* Support Puppet 3.0 minimum
+* Support Fedora 21, remove Debian 6 (Squeeze)
+
+## 1.6.0
+* Add FreeBSD support
+* Support Puppet 4 and future parser
+* Remove trailing slashes of tftproot directories
+
+## 1.5.1
+* Improved linting, minor style fixes
+
+## 1.5.0
+* Support for Debian 8 (Jessie) syslinux package names
+* Add root parameter to override root directory (#8942)
+
+## 1.4.3
+* Fix lint issues
+
+## 1.4.2
+* Fix Modulefile specification for Forge compatibility
+
+## 1.4.1
+* Specify xinetd version to workaround librarian-puppet bug
+
+## 1.4.0
+* Add Amazon Linux support
+* Puppet 2.6 support deprecated
+* Cleanup of manifest style
+* Add tests

Rakefile

@@ -32,7 +32,7 @@ begin
   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.user = 'theforeman'
     config.project = "puppet-#{metadata['name'].split('-').last}"
     config.future_release = metadata['version']
     config.exclude_labels = ['duplicate', 'question', 'invalid', 'wontfix', 'Modulesync', 'skip-changelog']

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "theforeman-tftp",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "author": "theforeman",
   "summary": "TFTP server configuration",
   "license": "GPL-3.0+",
@@ -16,7 +16,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.13.1 < 5.0.0"
+      "version_requirement": ">= 4.13.1 < 6.0.0"
     },
     {
       "name": "puppetlabs/xinetd",

spec/spec_helper.rb

@@ -7,7 +7,6 @@
 include RspecPuppetFacts
 
                                                                              # Original fact sources:
-add_custom_fact :concat_basedir, '/tmp'                                      # puppetlabs-concat
 add_custom_fact :puppet_environmentpath, '/etc/puppetlabs/code/environments' # puppetlabs-stdlib
 add_custom_fact :root_home, '/root'                                          # puppetlabs-stdlib
 

spec/spec_helper_acceptance.rb

@@ -1,5 +1,5 @@
-require 'beaker-rspec/spec_helper'
-require 'beaker-rspec/helpers/serverspec'
+require 'beaker-puppet'
+require 'beaker-rspec'
 require 'beaker/puppet_install_helper'
 require 'beaker/module_install_helper'