Skip to content

Commit

Permalink
Numerous updates
Browse files Browse the repository at this point in the history
Drop EOL operating systems
  • Loading branch information
treydock committed Jul 6, 2023
1 parent 558a7be commit d8f71dc
Show file tree
Hide file tree
Showing 12 changed files with 111 additions and 90 deletions.
25 changes: 18 additions & 7 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,31 @@ jobs:
fail-fast: false
matrix:
include:
- ruby: 2.7
- ruby: 2.7.8
puppet: 7
fixtures: .fixtures.yml
allow_failure: false
- ruby: 2.7
- ruby: 2.7.8
puppet: 7
fixtures: .fixtures-latest.yml
allow_failure: true
- ruby: 3.2.2
puppet: 8
fixtures: .fixtures.yml
allow_failure: false
- ruby: 3.2.2
puppet: 8
fixtures: .fixtures-latest.yml
allow_failure: true
exclude:
- puppet: 8
env:
BUNDLE_WITHOUT: system_tests:release
PUPPET_GEM_VERSION: "~> ${{ matrix.puppet }}.0"
FACTER_GEM_VERSION: "< 4.0"
FIXTURES_YML: ${{ matrix.fixtures }}
name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }} fixtures=${{ matrix.fixtures }})
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
Expand All @@ -48,10 +57,12 @@ jobs:
fail-fast: false
matrix:
set:
- "el8"
- "el9"
- "debian-10"
- "rocky-8"
- "ubuntu-1804"
- "debian-11"
- "ubuntu-2004"
- "ubuntu-2204"
puppet:
- "puppet7"
env:
Expand All @@ -70,7 +81,7 @@ jobs:
sudo apt-get remove mysql-server --purge
sudo apt-get install apparmor-profiles
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Setup ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
Expand Down
12 changes: 9 additions & 3 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,22 @@
# for the default values.
---
.github/workflows/ci.yaml:
unit_excludes:
# TODO: nsswitch module uses legacy facts so can't test against Puppet 8 yet.
- puppet: '8'
acceptance_matrix:
set:
- rocky-8
- el8
- el9
- debian-10
- ubuntu-1804
- debian-11
- ubuntu-2004
- ubuntu-2204
puppet:
- puppet7
- ---puppet8
.github/workflows/release.yaml:
unmanaged: true
username: ghoneycutt
spec/spec_helper.rb:
coverage_report: true
minimum_code_coverage_percentage: 100
Expand Down
28 changes: 9 additions & 19 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,23 @@ ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
minor_version = ruby_version_segments[0..1].join('.')

group :development do
gem "facter", '< 4.0', require: false
gem "fast_gettext", '1.1.0', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
gem "fast_gettext", require: false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
gem "json_pure", '<= 2.0.1', require: false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
gem "json", '= 1.8.1', require: false if Gem::Version.new(RUBY_VERSION.dup) == Gem::Version.new('2.1.9')
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-lint-param-docs", require: false
gem "voxpupuli-puppet-lint-plugins", '>= 3.0', require: false
gem "faraday", '~> 1.0', require: false
gem "github_changelog_generator", require: false
gem "voxpupuli-test", '6.0.0', require: false
gem "rubocop-performance", '~> 1.18', require: false
gem "faraday", '~> 1.0', require: false
gem "github_changelog_generator", require: false
gem "puppet-blacksmith", require: false
gem "puppet-strings", require: false
end
group :system_tests do
gem "puppet-module-posix-system-r#{minor_version}", '~> 0.5', require: false, platforms: [:ruby]
gem "puppet-module-win-system-r#{minor_version}", '~> 0.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.0')
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '~> 4.29')
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
gem "beaker-pe", require: false
gem "beaker-hostgenerator"
gem "beaker-rspec"
gem "beaker-docker"
gem "beaker-puppet"
gem "beaker-puppet_install_helper", require: false
gem "beaker-module_install_helper", require: false
end

puppet_version = ENV['PUPPET_GEM_VERSION']
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

require 'bundler'
require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
require 'beaker-rspec/rake_task' if Bundler.rubygems.find_name('beaker-rspec').any?
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-syntax/tasks/puppet-syntax'
require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
Expand Down
29 changes: 2 additions & 27 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,13 @@
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"7",
"8",
"9",
"10",
"11"
]
},
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"5",
"6",
"7",
"8",
"9"
Expand All @@ -47,18 +42,12 @@
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"5",
"6",
"7",
"8",
"9"
"7"
]
},
{
"operatingsystem": "OracleLinux",
"operatingsystemrelease": [
"5",
"6",
"7",
"8",
"9"
Expand All @@ -67,11 +56,7 @@
{
"operatingsystem": "Scientific",
"operatingsystemrelease": [
"5",
"6",
"7",
"8",
"9"
"7"
]
},
{
Expand All @@ -85,30 +70,20 @@
{
"operatingsystem": "SLES",
"operatingsystemrelease": [
"9",
"10",
"11",
"12",
"15"
]
},
{
"operatingsystem": "SLED",
"operatingsystemrelease": [
"9",
"10",
"11",
"12",
"15"
]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"12.04",
"14.04",
"16.04",
"18.04",
"20.04",
"22.04"
]
Expand Down
21 changes: 12 additions & 9 deletions spec/acceptance/nodesets/debian-11.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
HOSTS:
debian11:
roles:
- agent
- agent
platform: debian-11-amd64
hypervisor: docker
image: debian:11
docker_preserve_image: true
docker_cmd:
- '/sbin/init'
- '/sbin/init'
docker_image_commands:
- 'apt-get install -y wget net-tools systemd-sysv locales'
- 'rm -f /usr/sbin/policy-rc.d'
- 'echo "LC_ALL=en_US.UTF-8" >> /etc/environment'
- 'echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen'
- 'echo "LANG=en_US.UTF-8" > /etc/locale.conf'
- 'locale-gen en_US.UTF-8'
docker_container_name: 'pam-debian10'
- 'apt-get install -y wget net-tools systemd-sysv locales apt-transport-https ca-certificates'
- 'echo "LC_ALL=en_US.UTF-8" >> /etc/environment'
- 'echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen'
- 'echo "LANG=en_US.UTF-8" > /etc/locale.conf'
- 'locale-gen en_US.UTF-8'
docker_env:
- LANG=en_US.UTF-8
- LANGUAGE=en_US.UTF-8
- LC_ALL=en_US.UTF-8
docker_container_name: 'pam-debian11'
CONFIG:
log_level: debug
type: foss
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
HOSTS:
rocky-8:
el8:
roles:
- agent
platform: el-8-x86_64
hypervisor: docker
image: rockylinux/rockylinux:8
image: almalinux:8
docker_preserve_image: true
docker_cmd:
- '/usr/sbin/init'
docker_image_commands:
- 'yum install -y dnf-utils'
- 'dnf install -y dnf-utils'
- 'dnf config-manager --set-enabled powertools'
- 'yum install -y wget which cronie iproute initscripts'
- 'dnf install -y wget which cronie iproute initscripts'
docker_env:
- LANG=en_US.UTF-8
- LANGUAGE=en_US.UTF-8
- LC_ALL=en_US.UTF-8
docker_container_name: 'pam-el8'
CONFIG:
log_level: debug
type: foss
ssh:
password: root
auth_methods: ["password"]

25 changes: 25 additions & 0 deletions spec/acceptance/nodesets/el9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
HOSTS:
el9:
roles:
- agent
platform: el-9-x86_64
hypervisor: docker
image: almalinux:9
docker_preserve_image: true
docker_cmd:
- '/usr/sbin/init'
docker_image_commands:
- 'dnf install -y dnf-utils'
- 'dnf config-manager --set-enabled crb'
- 'dnf install -y wget which cronie iproute initscripts'
docker_env:
- LANG=en_US.UTF-8
- LANGUAGE=en_US.UTF-8
- LC_ALL=en_US.UTF-8
docker_container_name: 'pam-el9'
CONFIG:
log_level: debug
type: foss
ssh:
password: root
auth_methods: ["password"]
9 changes: 7 additions & 2 deletions spec/acceptance/nodesets/ubuntu-2004.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,17 @@ HOSTS:
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y -q net-tools wget locales'
- "rm -f /etc/dpkg/dpkg.cfg.d/excludes"
- 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates'
- 'locale-gen en_US.UTF-8'
docker_env:
- LANG=en_US.UTF-8
- LANGUAGE=en_US.UTF-8
- LC_ALL=en_US.UTF-8
docker_container_name: 'pam-ubuntu2004'
CONFIG:
type: foss
log_level: debug
type: foss
ssh:
password: root
auth_methods: ["password"]
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
HOSTS:
ubuntu1804:
ubuntu2204:
roles:
- agent
platform: ubuntu-18.04-amd64
platform: ubuntu-22.04-amd64
hypervisor : docker
image: ubuntu:18.04
image: ubuntu:22.04
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- "rm -f /etc/dpkg/dpkg.cfg.d/excludes"
- 'apt-get install -y wget net-tools locales apt-transport-https ca-certificates'
- 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates'
- 'locale-gen en_US.UTF-8'
docker_container_name: 'pam-ubuntu1804'
docker_env:
- LANG=en_US.UTF-8
- LANGUAGE=en_US.UTF-8
- LC_ALL=en_US.UTF-8
docker_container_name: 'pam-ubuntu2204'
CONFIG:
log_level: debug
type: foss
ssh:
password: root
auth_methods: ["password"]

Loading

0 comments on commit d8f71dc

Please sign in to comment.