Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Puppet 6, add Puppet 8 support, drop Ubuntu 18.04 #298

Merged
merged 2 commits into from
Jul 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,29 @@ jobs:
fail-fast: false
matrix:
include:
- ruby: 2.5.9
puppet: 6
- ruby: 2.7.7
puppet: 7
fixtures: .fixtures.yml
allow_failure: false
- ruby: 2.7.6
puppet: 7
- ruby: 3.2.2
puppet: 8
fixtures: .fixtures.yml
allow_failure: false
- ruby: 2.5.9
puppet: 6
fixtures: .fixtures-latest.yml
allow_failure: true
- ruby: 2.7.6
puppet: 7
fixtures: .fixtures-latest.yml
allow_failure: true
- ruby: 3.2.2
puppet: 8
fixtures: .fixtures-latest.yml
allow_failure: true
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 @@ -62,23 +61,22 @@ jobs:
- "el9"
- "debian-10"
- "debian-11"
- "ubuntu-1804"
- "ubuntu-2004"
- "ubuntu-2204"
puppet:
- "puppet6"
- "puppet7"
- "puppet8"
keycloak_version:
- "21.0.1"
keycloak_full:
- "no"
include:
- set: "el8"
puppet: "puppet6"
puppet: "puppet7"
keycloak_version: "21.0.1"
keycloak_full: "yes"
- set: "el8"
puppet: "puppet7"
puppet: "puppet8"
keycloak_version: "21.0.1"
keycloak_full: "yes"
env:
Expand All @@ -98,7 +96,7 @@ jobs:
sudo apt-get update
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
18 changes: 7 additions & 11 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Rakefile:
.github/workflows/ci.yaml:
unit_name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }} fixtures=${{ matrix.fixtures }})
unit_includes:
- ruby: '2.5.9'
puppet: '6'
- ruby: '2.7.7'
puppet: '7'
fixtures: .fixtures-latest.yml
allow_failure: true
- ruby: '2.7.6'
puppet: '7'
- ruby: '3.2.2'
puppet: '8'
fixtures: .fixtures-latest.yml
allow_failure: true
acceptance_name: '${{ matrix.puppet }} ${{ matrix.set }} (keycloak=${{ matrix.keycloak_version }} full=${{ matrix.keycloak_full }})'
Expand All @@ -20,22 +20,21 @@ Rakefile:
- el9
- debian-10
- debian-11
- ubuntu-1804
- ubuntu-2004
- ubuntu-2204
puppet:
- puppet6
- puppet7
- puppet8
keycloak_version:
- '21.0.1'
keycloak_full: ['no']
acceptance_includes:
- set: el8
puppet: puppet6
puppet: puppet7
keycloak_version: 21.0.1
keycloak_full: 'yes'
- set: el8
puppet: puppet7
puppet: puppet8
keycloak_version: 21.0.1
keycloak_full: 'yes'
.gitignore:
Expand All @@ -60,9 +59,6 @@ spec/acceptance/nodesets/debian-10.yml:
spec/acceptance/nodesets/debian-11.yml:
packages:
- iproute2
spec/acceptance/nodesets/ubuntu-1804.yml:
packages:
- iproute2
spec/acceptance/nodesets/ubuntu-2004.yml:
packages:
- iproute2
Expand Down
7 changes: 3 additions & 4 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"18.04",
"20.04",
"22.04"
]
Expand All @@ -85,10 +84,10 @@
"requirements": [
{
"name": "puppet",
"version_requirement": ">= 6.0.0 < 8.0.0"
"version_requirement": ">= 7.0.0 < 9.0.0"
}
],
"pdk-version": "2.1.0",
"pdk-version": "2.7.1",
"template-url": "https://github.com/treydock/pdk-templates.git#master",
"template-ref": "heads/master-0-gbfcd6dd"
"template-ref": "heads/master-0-g70732db"
}
25 changes: 0 additions & 25 deletions spec/acceptance/nodesets/ubuntu-1804.yml

This file was deleted.

2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
next unless File.exist?(f) && File.readable?(f) && File.size?(f)

begin
default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
default_facts.merge!(YAML.safe_load(File.read(f)))
rescue StandardError => e
RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
end
Expand Down