Skip to content

Commit c85e9c0

Browse files
authored
Support newer stdlib and systemd modules (#131)
* Support newer stdlib and systemd modules Avoid apt 9.1.0 as can't force >= stdlib 9.0 yet due to concat dependencies * Hacks to force modules ignoring dependencies * Avoid deprecation warnings with to_yaml that break Puppet 8 * Try to go back to strict warning * Skip nightly acceptance until can debug what's broken
1 parent 48c5523 commit c85e9c0

File tree

11 files changed

+46
-6
lines changed

11 files changed

+46
-6
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
FIXTURES_YML: ${{ matrix.fixtures }}
3333
name: Puppet ${{ matrix.puppet }} (Ruby ${{ matrix.ruby }})
3434
steps:
35-
- uses: actions/checkout@v2
35+
- uses: actions/checkout@v3
3636
- name: Setup ruby
3737
uses: ruby/setup-ruby@v1
3838
with:
@@ -75,7 +75,7 @@ jobs:
7575
sudo apt-get update
7676
sudo apt-get install apparmor-profiles
7777
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
78-
- uses: actions/checkout@v2
78+
- uses: actions/checkout@v3
7979
- name: Setup ruby
8080
uses: ruby/setup-ruby@v1
8181
with:

.github/workflows/release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v3
1818
- name: Setup Ruby
1919
uses: ruby/setup-ruby@v1
2020
with:

.sync.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,18 @@ Rakefile:
1919
delete: true
2020
appveyor.yml:
2121
delete: true
22+
spec/acceptance/nodesets/el7.yml:
23+
default_module_install_opts:
24+
ignore-dependencies: ~
25+
force: ~
26+
spec/acceptance/nodesets/el8.yml:
27+
default_module_install_opts:
28+
ignore-dependencies: ~
29+
force: ~
30+
spec/acceptance/nodesets/el9.yml:
31+
default_module_install_opts:
32+
ignore-dependencies: ~
33+
force: ~
2234
spec/acceptance/nodesets/debian-9.yml:
2335
delete: true
2436
spec/acceptance/nodesets/debian-10.yml:
@@ -30,6 +42,12 @@ spec/acceptance/nodesets/ubuntu-1804.yml:
3042
spec/acceptance/nodesets/ubuntu-2004.yml:
3143
packages:
3244
- cron
45+
default_module_install_opts:
46+
ignore-dependencies: ~
47+
force: ~
3348
spec/acceptance/nodesets/ubuntu-2204.yml:
3449
packages:
3550
- cron
51+
default_module_install_opts:
52+
ignore-dependencies: ~
53+
force: ~

metadata.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"dependencies": [
1111
{
1212
"name": "puppetlabs/stdlib",
13-
"version_requirement": ">= 4.25.0 < 9.0.0"
13+
"version_requirement": ">= 4.25.0 < 10.0.0"
1414
},
1515
{
1616
"name": "puppetlabs/apt",
@@ -38,7 +38,7 @@
3838
},
3939
{
4040
"name": "puppet/systemd",
41-
"version_requirement": ">= 0.4.0 <5.0.0"
41+
"version_requirement": ">= 0.4.0 <6.0.0"
4242
},
4343
{
4444
"name": "puppet/epel",

spec/acceptance/nodesets/el7.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ HOSTS:
1717
- LANGUAGE=en_US.UTF-8
1818
- LC_ALL=en_US.UTF-8
1919
docker_container_name: 'openondemand-el7'
20+
default_module_install_opts:
21+
ignore-dependencies:
22+
force:
2023
CONFIG:
2124
log_level: debug
2225
type: foss

spec/acceptance/nodesets/el8.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ HOSTS:
1717
- LANGUAGE=en_US.UTF-8
1818
- LC_ALL=en_US.UTF-8
1919
docker_container_name: 'openondemand-el8'
20+
default_module_install_opts:
21+
ignore-dependencies:
22+
force:
2023
CONFIG:
2124
log_level: debug
2225
type: foss

spec/acceptance/nodesets/el9.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ HOSTS:
1717
- LANGUAGE=en_US.UTF-8
1818
- LC_ALL=en_US.UTF-8
1919
docker_container_name: 'openondemand-el9'
20+
default_module_install_opts:
21+
ignore-dependencies:
22+
force:
2023
CONFIG:
2124
log_level: debug
2225
type: foss

spec/acceptance/nodesets/ubuntu-2004.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ HOSTS:
1616
- LANGUAGE=en_US.UTF-8
1717
- LC_ALL=en_US.UTF-8
1818
docker_container_name: 'openondemand-ubuntu2004'
19+
default_module_install_opts:
20+
ignore-dependencies:
21+
force:
1922
CONFIG:
2023
log_level: debug
2124
type: foss

spec/acceptance/nodesets/ubuntu-2204.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ HOSTS:
1616
- LANGUAGE=en_US.UTF-8
1717
- LC_ALL=en_US.UTF-8
1818
docker_container_name: 'openondemand-ubuntu2204'
19+
default_module_install_opts:
20+
ignore-dependencies:
21+
force:
1922
CONFIG:
2023
log_level: debug
2124
type: foss

spec/acceptance/openondemand_spec.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ class { 'openondemand':
1616
end
1717
end
1818

19-
context 'with nightly repo' do
19+
context 'with nightly repo', skip: 'Currently broken' do
2020
it 'runs successfully' do
2121
pp = <<-PP
2222
class { 'openondemand':
23+
# TODO: Remove once repo_release uses 3.1
24+
repo_release => 'build/3.1',
2325
repo_nightly => true,
2426
ondemand_package_ensure => 'latest',
2527
generator_insecure => true,

0 commit comments

Comments
 (0)