diff --git a/.fixtures.yml b/.fixtures.yml index f75fc2c..8588dcc 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,29 +1,29 @@ --- fixtures: repositories: - auditd: https://github.com/simp/pupmod-simp-auditd + auditd: https://github.com/simp/pupmod-simp-auditd.git augeas_core: repo: https://github.com/simp/pupmod-puppetlabs-augeas_core.git puppet_version: ">= 6.0.0" - augeasproviders_core: https://github.com/hercules-team/augeasproviders_core - augeasproviders_grub: https://github.com/hercules-team/augeasproviders_grub - compliance_markup: https://github.com/simp/pupmod-simp-compliance_markup - concat: https://github.com/simp/puppetlabs-concat - firewalld: https://github.com/simp/pupmod-voxpupuli-firewalld - iptables: https://github.com/simp/pupmod-simp-iptables - logrotate: https://github.com/simp/pupmod-simp-logrotate - pki: https://github.com/simp/pupmod-simp-pki - selinux_core: https://github.com/puppetlabs/puppetlabs-selinux_core - simp_options: https://github.com/simp/pupmod-simp-simp_options - simp_firewalld: https://github.com/simp/pupmod-simp-simp_firewalld - simplib: https://github.com/simp/pupmod-simp-simplib - stdlib: https://github.com/simp/puppetlabs-stdlib - stunnel: https://github.com/simp/pupmod-simp-stunnel - systemd: https://github.com/simp/puppet-systemd - tcpwrappers: https://github.com/simp/pupmod-simp-tcpwrappers + augeasproviders_core: https://github.com/hercules-team/augeasproviders_core.git + augeasproviders_grub: https://github.com/hercules-team/augeasproviders_grub.git + compliance_markup: https://github.com/simp/pupmod-simp-compliance_markup.git + concat: https://github.com/simp/puppetlabs-concat.git + firewalld: https://github.com/simp/pupmod-voxpupuli-firewalld.git + iptables: https://github.com/simp/pupmod-simp-iptables.git + logrotate: https://github.com/simp/pupmod-simp-logrotate.git + pki: https://github.com/simp/pupmod-simp-pki.git + selinux_core: https://github.com/puppetlabs/puppetlabs-selinux_core.git + simp_options: https://github.com/simp/pupmod-simp-simp_options.git + simp_firewalld: https://github.com/simp/pupmod-simp-simp_firewalld.git + simplib: https://github.com/simp/pupmod-simp-simplib.git + stdlib: https://github.com/simp/puppetlabs-stdlib.git + stunnel: https://github.com/simp/pupmod-simp-stunnel.git + systemd: https://github.com/simp/puppet-systemd.git + tcpwrappers: https://github.com/simp/pupmod-simp-tcpwrappers.git disa_stig-el7-baseline: - repo: https://github.com/simp/inspec-profile-disa_stig-el7 - branch: master + repo: https://github.com/simp/inspec-profile-disa_stig-el7.git + branch: master target: spec/fixtures/inspec_deps/inspec_profiles/profiles symlinks: rsyslog: "#{source_dir}" diff --git a/.github/workflows/pr_tests.yml b/.github/workflows/pr_tests.yml index b95a01e..28ccd38 100644 --- a/.github/workflows/pr_tests.yml +++ b/.github/workflows/pr_tests.yml @@ -11,13 +11,11 @@ # The testing matrix considers ruby/puppet versions supported by SIMP and PE: # ------------------------------------------------------------------------------ # Release Puppet Ruby EOL -# SIMP 6.4 5.5 2.40 TBD -# PE 2018.1 5.5 2.40 2021-01 (LTS overlap) -# PE 2019.8 6.18 2.5 2022-12 (LTS) +# PE 2019.8 6.22 2.5 2022-12 (LTS) +# PE 2021.Y 7.x 2.7 Quarterly updates # -# https://puppet.com/docs/pe/2018.1/component_versions_in_recent_pe_releases.html +# https://puppet.com/docs/pe/latest/component_versions_in_recent_pe_releases.html # https://puppet.com/misc/puppet-enterprise-lifecycle -# https://puppet.com/docs/pe/2018.1/overview/getting_support_for_pe.html # ============================================================================== # # https://docs.github.com/en/actions/reference/events-that-trigger-workflows @@ -111,12 +109,9 @@ jobs: strategy: matrix: puppet: - - label: 'Puppet 6.18 [SIMP 6.5/PE 2019.8]' - puppet_version: '~> 6.18.0' + - label: 'Puppet 6.22 [SIMP 6.6/PE 2019.8]' + puppet_version: '~> 6.22.1' ruby_version: '2.5' - - label: 'Puppet 5.5 [SIMP 6.4/PE 2018.1]' - puppet_version: '~> 5.5.22' - ruby_version: '2.4' - label: 'Puppet 7.x' puppet_version: '~> 7.0' ruby_version: '2.7' diff --git a/.gitignore b/.gitignore index 1fc88d6..9d5658a 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ dist /.rspec_system /.vagrant /.bundle +/.vendor /vendor /junit /log diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index beb08dd..c735d76 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,9 +13,7 @@ # https://puppet.com/docs/pe/2018.1/overview/getting_support_for_pe.html # ------------------------------------------------------------------------------ # Release Puppet Ruby EOL -# SIMP 6.4 5.5 2.4.10 TBD -# PE 2018.1 5.5 2.4.10 2021-01 (LTS overlap) -# PE 2019.8 6.18 2.5.7 2022-12 (LTS) +# PE 2019.8 6.22 2.5.7 2022-12 (LTS) --- stages: @@ -32,7 +30,7 @@ variables: # anchors. If it is still `UNDEFINED`, all the other setting from the job's # anchor are also missing. PUPPET_VERSION: 'UNDEFINED' # <- Matrixed jobs MUST override this (or fail) - BUNDLER_VERSION: '1.17.1' + BUNDLER_VERSION: '2.2.19' SIMP_MATRIX_LEVEL: '1' SIMP_FORCE_RUN_MATRIX: 'no' @@ -224,20 +222,6 @@ variables: # Puppet Versions #----------------------------------------------------------------------- -.pup_5_x: &pup_5_x - image: 'ruby:2.4' - variables: - PUPPET_VERSION: '~> 5.0' - BEAKER_PUPPET_COLLECTION: 'puppet5' - MATRIX_RUBY_VERSION: '2.4' - -.pup_5_pe: &pup_5_pe - image: 'ruby:2.4' - variables: - PUPPET_VERSION: '5.5.22' - BEAKER_PUPPET_COLLECTION: 'puppet5' - MATRIX_RUBY_VERSION: '2.4' - .pup_6_x: &pup_6_x image: 'ruby:2.5' variables: @@ -248,7 +232,7 @@ variables: .pup_6_pe: &pup_6_pe image: 'ruby:2.5' variables: - PUPPET_VERSION: '6.18.0' + PUPPET_VERSION: '6.22.1' BEAKER_PUPPET_COLLECTION: 'puppet6' MATRIX_RUBY_VERSION: '2.5' @@ -325,15 +309,6 @@ pup-lint: # Unit Tests #----------------------------------------------------------------------- -pup5.x-unit: - <<: *pup_5_x - <<: *unit_tests - <<: *with_SIMP_SPEC_MATRIX_LEVEL_2 - -pup5.pe-unit: - <<: *pup_5_pe - <<: *unit_tests - pup6.x-unit: <<: *pup_6_x <<: *unit_tests @@ -357,19 +332,6 @@ pup7.x-unit: # Repo-specific content # ============================================================================== -pup5.pe: - <<: *pup_5_pe - <<: *acceptance_base - script: - - 'bundle exec rake beaker:suites[default,default]' - -pup5.pe-centos7: - <<: *pup_5_pe - <<: *acceptance_base - <<: *with_SIMP_ACCEPTANCE_MATRIX_LEVEL_3 - script: - - 'bundle exec rake beaker:suites[default,centos-7]' - # Until we can figure out how to make this test robust, it is not worth # wasting GitLab runner time to run this permutation. # Manually, we can see that failover is working, but all the messages @@ -382,38 +344,6 @@ pup5.pe-centos7: # script: # - 'bundle exec rake beaker:suites[failover,default]' -pup5.pe-doubleforward: - <<: *pup_5_pe - <<: *acceptance_base - script: - - 'bundle exec rake beaker:suites[doubleforward,default]' - -pup5.pe-centos7-doubleforward: - <<: *pup_5_pe - <<: *acceptance_base - <<: *with_SIMP_ACCEPTANCE_MATRIX_LEVEL_3 - script: - - 'bundle exec rake beaker:suites[doubleforward,centos-7]' - -pup5.pe-fips: - <<: *pup_5_pe - <<: *acceptance_base - script: - - 'BEAKER_fips=yes bundle exec rake beaker:suites[default,default]' - -pup5.pe-oel: - <<: *pup_5_pe - <<: *acceptance_base - script: - - 'bundle exec rake beaker:suites[default,oel]' - -pup5.pe-oel-fips: - <<: *pup_5_pe - <<: *acceptance_base - <<: *with_SIMP_ACCEPTANCE_MATRIX_LEVEL_3 - script: - - 'BEAKER_fips=yes bundle exec rake beaker:suites[default,oel]' - pup6.x: <<: *pup_6_x <<: *acceptance_base diff --git a/.pdkignore b/.pdkignore new file mode 100644 index 0000000..84caa42 --- /dev/null +++ b/.pdkignore @@ -0,0 +1,57 @@ +# .pdkignore masks files from inclusion by `pdk build`. +# +# It is used by CI when building modules to publish to the Puppet Forge and to +# mask symlinks from the `pdk build` test in the module's RELENG checks. +# ------------------------------------------------------------------------------ +# NOTICE: **This file is maintained with puppetsync** +# +# This file is automatically updated as part of a puppet module baseline. +# The next baseline sync will overwrite any local changes made to this file. +# ------------------------------------------------------------------------------ +.*.sw? +.git/ +.metadata +.yardoc +.yardwarns +*.iml +/.bundle/ +/.idea/ +/.vagrant/ +/coverage/ +/bin/ +/doc/ +/Gemfile.local +/Gemfile.lock +/junit/ +/log/ +/pkg/ +/dist/ +/tmp/ +/vendor/ +/.vendor/ +/convert_report.txt +/update_report.txt +.DS_Store +.project +.envrc +/inventory.yaml +/appveyor.yml +/.fixtures.yml +/Gemfile +/.gitattributes +/.gitignore +/.github/ +/.gitlab-ci.yml +/.pdkignore +/.puppet-lint.rc +/.sync.yml +/.pmtignore +/Rakefile +/rakelib/ +/.rspec +/.rubocop.yml +/.travis.yml +/.yardopts +/spec/ +/.vscode/ +/tests/ diff --git a/.pmtignore b/.pmtignore deleted file mode 100644 index 02aebfb..0000000 --- a/.pmtignore +++ /dev/null @@ -1,31 +0,0 @@ -# .pmtignore is required to mask symlinks from the `puppet module build` test -# In the module's pipeline sanity checks -# ------------------------------------------------------------------------------ -# NOTICE: **This file is maintained with puppetsync** -# -# This file is automatically updated as part of a puppet module baseline. -# The next baseline sync will overwrite any local changes made to this file. -# ------------------------------------------------------------------------------ -.*.sw? -.bundle/ -.git/ -.github/ -.gitlab-ci.yml -.rspec_system -.vagrant/ -.vendor/ -.yardoc -dist/ -doc/ -Gemfile.lock -junit/ -log/ -pkg/ -spec/acceptance/ -spec/defines/ -spec/fixtures/ -spec/rp_env/ -!/spec/fixtures/site.pp -!/spec/hieradata/default.yaml -tests/ -vendor/ diff --git a/CHANGELOG b/CHANGELOG index a93d8d0..df83fd6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +* Wed Jun 16 2021 Chris Tessmer - 8.1.0 +- Removed support for Puppet 5 +- Ensured support for Puppet 7 in requirements and stdlib + * Fri Jan 29 2021 Liz Nemsick - 8.0.0 - Removed support for Rsyslog < 8.24.0. - Rsyslog >= 8.24.0 is used for EL7.4 and later. diff --git a/Gemfile b/Gemfile index e9eb071..4ed1bf9 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ ENV['PDK_DISABLE_ANALYTICS'] ||= 'true' gem_sources.each { |gem_source| source gem_source } group :test do - puppet_version = ENV['PUPPET_VERSION'] || '~> 6.18' + puppet_version = ENV['PUPPET_VERSION'] || '~> 6.22' major_puppet_version = puppet_version.scan(/(\d+)(?:\.|\Z)/).flatten.first.to_i gem 'rake' gem 'puppet', puppet_version @@ -24,7 +24,7 @@ group :test do gem 'puppet-lint-empty_string-check', :require => false gem 'puppet-lint-trailing_comma-check', :require => false gem 'simp-rspec-puppet-facts', ENV['SIMP_RSPEC_PUPPET_FACTS_VERSION'] || '~> 3.1' - gem 'simp-rake-helpers', ENV['SIMP_RAKE_HELPERS_VERSION'] || ['>= 5.11.5', '< 6'] + gem 'simp-rake-helpers', ENV['SIMP_RAKE_HELPERS_VERSION'] || ['>= 5.12.1', '< 6'] gem( 'pdk', ENV['PDK_VERSION'] || '~> 2.0', :require => false) if major_puppet_version > 5 gem 'pathspec', '~> 0.2' if Gem::Requirement.create('< 2.6').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup)) end @@ -38,7 +38,7 @@ end group :system_tests do gem 'beaker' gem 'beaker-rspec' - gem 'simp-beaker-helpers', ENV['SIMP_BEAKER_HELPERS_VERSION'] || ['>= 1.21.4', '< 2'] + gem 'simp-beaker-helpers', ENV['SIMP_BEAKER_HELPERS_VERSION'] || ['>= 1.23.2', '< 2'] end # Evaluate extra gemfiles if they exist diff --git a/metadata.json b/metadata.json index 8bb0ca5..8657926 100644 --- a/metadata.json +++ b/metadata.json @@ -1,6 +1,6 @@ { "name": "simp-rsyslog", - "version": "8.0.0", + "version": "8.1.0", "author": "SIMP Team", "summary": "A puppet module to support RSyslog version 8.", "license": "Apache-2.0", @@ -14,12 +14,13 @@ "syslog" ], "dependencies": [ - { "name": "camptocamp/systemd", + { + "name": "camptocamp/systemd", "version_requirement": ">= 2.2.0 < 3.0.0" }, { "name": "puppetlabs/stdlib", - "version_requirement": ">= 4.13.1 < 7.0.0" + "version_requirement": ">= 6.18.0 < 8.0.0" }, { "name": "simp/simplib", @@ -72,7 +73,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 5.0.0 < 7.0.0" + "version_requirement": ">= 6.22.1 < 8.0.0" } ] }