From d21aaeea5a97658164340d3229b12a72b2474b76 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Fri, 29 Sep 2023 16:16:33 +0200 Subject: [PATCH 1/3] Update gems to support testing Puppet 8 --- .github/workflows/ci.yml | 4 +--- .gitignore | 3 ++- CONTRIBUTING.md | 2 +- Gemfile | 18 +++++------------- spec/spec_helper_acceptance.rb | 2 +- 5 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cd8418b..06ee271 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,8 +3,6 @@ name: CI on: pull_request: - schedule: - - cron: '4 4 * * *' concurrency: @@ -14,7 +12,7 @@ concurrency: jobs: puppet: name: Puppet - uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v1 + uses: voxpupuli/gha-puppet/.github/workflows/beaker.yml@v2 with: pidfile_workaround: 'false' rubocop: false diff --git a/.gitignore b/.gitignore index 77892f5..a5f47aa 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,8 @@ vendor/ .ruby-* ## rspec -spec/fixtures/ +spec/fixtures/manifests +spec/fixtures/modules junit/ ## Puppet module diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0f6b955..a4c162f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -194,7 +194,7 @@ More filter info available [here](https://relishapp.com/rspec/rspec-core/v/3-9/d To run OS specific tests: ```shell -SPEC_FACTS_OS=redhat-7-x86_64 bundle exec rspec spec/classes/foreman_spec.rb +SPEC_FACTS_OS=redhat-8-x86_64 bundle exec rspec spec/classes/foreman_spec.rb ``` If you have more than one version of `redhat` OS specified in metadata.json, diff --git a/Gemfile b/Gemfile index 89f86f8..425b5da 100644 --- a/Gemfile +++ b/Gemfile @@ -3,24 +3,16 @@ source 'https://rubygems.org' -gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '>= 5.5', groups: ['development', 'test'] +gem 'puppet', ENV.fetch('PUPPET_GEM_VERSION', '>= 7'), groups: ['development', 'test'] gem 'rake' gem 'kafo_module_lint', {"groups"=>["test"]} -gem 'puppet-lint-empty_string-check', {"groups"=>["test"]} -gem 'puppet-lint-file_ensure-check', {"groups"=>["test"]} -gem 'puppet-lint-param-docs', '>= 1.3.0', {"groups"=>["test"]} -gem 'puppet-lint-spaceship_operator_without_tag-check', {"groups"=>["test"]} -gem 'puppet-lint-strict_indent-check', {"groups"=>["test"]} -gem 'puppet-lint-undef_in_function-check', {"groups"=>["test"]} -gem 'voxpupuli-test', '~> 5.0', {"groups"=>["test"]} +gem 'puppet-lint-spaceship_operator_without_tag-check', '~> 1.0', {"groups"=>["test"]} +gem 'voxpupuli-test', '~> 7.0', {"groups"=>["test"]} gem 'github_changelog_generator', '>= 1.15.0', {"groups"=>["development"]} -gem 'puppet_metadata', '~> 1.3' +gem 'puppet_metadata', '~> 3.4' gem 'puppet-blacksmith', '>= 6.0.0', {"groups"=>["development"]} -gem 'voxpupuli-acceptance', '~> 1.0', {"groups"=>["system_tests"]} +gem 'voxpupuli-acceptance', '~> 2.0', {"groups"=>["system_tests"]} gem 'puppetlabs_spec_helper', {"groups"=>["system_tests"]} -# Pin rdoc to prevent updating bundled psych (https://github.com/ruby/rdoc/commit/ebe185c8775b2afe844eb3da6fa78adaa79e29a4) -gem 'rdoc', '< 6.4' - # vim:ft=ruby diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 5351a52..bdf14c4 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,6 +1,6 @@ require 'voxpupuli/acceptance/spec_helper_acceptance' -ENV['BEAKER_setfile'] ||= 'centos7-64{hostname=centos7-64.example.com}' +ENV['BEAKER_setfile'] ||= 'centos8-64{hostname=centos8-64.example.com}' configure_beaker(modules: :fixtures) do |host| if fact_on(host, 'os.family') == 'RedHat' From 34ff55cdfa88d2c0e834aa94841551bec09f602d Mon Sep 17 00:00:00 2001 From: Tim Meusel Date: Fri, 4 Aug 2023 17:47:38 +0200 Subject: [PATCH 2/3] Add Puppet 8 support --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index 06de345..7c7a584 100644 --- a/metadata.json +++ b/metadata.json @@ -21,7 +21,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 7.0.0 < 8.0.0" + "version_requirement": ">= 7.0.0 < 9.0.0" } ], "operatingsystem_support": [ From fd1b011a116d96c291aeeda537c2ecdb5b7a7427 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Tue, 14 Nov 2023 19:17:37 +0100 Subject: [PATCH 3/3] Release 9.0.0 --- CHANGELOG.md | 16 ++++++++++++++++ metadata.json | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0fa69c6..41c0cf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +## [9.0.0](https://github.com/theforeman/puppet-tftp/tree/9.0.0) (2023-11-14) + +[Full Changelog](https://github.com/theforeman/puppet-tftp/compare/8.0.0...9.0.0) + +**Breaking changes:** + +- Drop Fedora support [\#145](https://github.com/theforeman/puppet-tftp/pull/145) ([ekohl](https://github.com/ekohl)) +- Drop Puppet 6 support [\#144](https://github.com/theforeman/puppet-tftp/pull/144) ([ekohl](https://github.com/ekohl)) +- Drop Ubuntu 18.04 & Debian 9, add Red Hat 9 support [\#142](https://github.com/theforeman/puppet-tftp/pull/142) ([dvo-rak](https://github.com/dvo-rak)) + +**Implemented enhancements:** + +- Add Puppet 8 support [\#140](https://github.com/theforeman/puppet-tftp/pull/140) ([bastelfreak](https://github.com/bastelfreak)) +- puppetlabs/stdlib: Allow 9.x [\#139](https://github.com/theforeman/puppet-tftp/pull/139) ([bastelfreak](https://github.com/bastelfreak)) +- make syslinux package management optional [\#138](https://github.com/theforeman/puppet-tftp/pull/138) ([UiP9AV6Y](https://github.com/UiP9AV6Y)) + ## [8.0.0](https://github.com/theforeman/puppet-tftp/tree/8.0.0) (2022-10-27) [Full Changelog](https://github.com/theforeman/puppet-tftp/compare/7.2.0...8.0.0) diff --git a/metadata.json b/metadata.json index 7c7a584..be0ebd3 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "theforeman-tftp", - "version": "8.0.0", + "version": "9.0.0", "author": "theforeman", "summary": "TFTP server configuration", "license": "GPL-3.0+",