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.

Sign up for GitHub

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 Ubuntu 16.04 and 18.04 support #152

Merged
merged 6 commits into from
Feb 23, 2024
Merged

Drop Ubuntu 16.04 and 18.04 support #152

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
44fec1e
puppetlabs/concat: allow 9.x
zilchms Feb 22, 2024
d9608d6
drop ubuntu 16.04 and 18.04 support
zilchms Feb 22, 2024
29857c3
drop fails on no longer supported OSes
zilchms Feb 23, 2024
8f4b711
rework spec test to include 18.04 tests on every os
zilchms Feb 23, 2024
63cb872
remove hardcoded os version fail for non LTS ubuntu
zilchms Feb 23, 2024
c6f8c84
remove check for reload command
zilchms Feb 23, 2024
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
2 changes: 1 addition & 1 deletion manifests/repository.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
$url = "${scheme}${address}"
}
if $os == 'Ubuntu' {
unless $osrelease in ['12.04', '14.04', '16.04', '18.04', '20.04'] {
unless $osrelease in ['20.04'] {
zilchms marked this conversation as resolved.
Show resolved Hide resolved
fail('Only Ubunutu LTS Versions are supported')
}
$location = "${url}xUbuntu_${osrelease}"
Expand Down
4 changes: 1 addition & 3 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
{
"name": "puppetlabs/concat",
"version_requirement": ">= 4.1.0 < 8.0.0"
"version_requirement": ">= 4.1.0 < 10.0.0"
},
{
"name": "puppetlabs/stdlib",
Expand All @@ -42,8 +42,6 @@
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"16.04",
"18.04",
"20.04"
]
},
Expand Down
22 changes: 8 additions & 14 deletions spec/classes/director_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,15 @@

context 'with default values for all parameters' do
it { is_expected.to compile }
it { is_expected.to compile.with_all_deps }
it { is_expected.to contain_class('bareos') }

it do

Check failure on line 17 in spec/classes/director_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 8 (Ruby 3.2) 

bareos::director on amazon-2-x86_64 with default values for all parameters is expected to contain Service[bareos-dir] with hasrestart => false and restart => "systemctl reload bareos-dir"

Failure/Error:
  expect(subject).to contain_service('bareos-dir').with(
    'hasrestart' => false,
    'restart' => 'systemctl reload bareos-dir'
  )

  expected that the catalogue would contain Service[bareos-dir] with restart set to "systemctl reload bareos-dir" but it is set to "service bareos-dir relaod"

Check failure on line 17 in spec/classes/director_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / 7 (Ruby 2.7) 

bareos::director on amazon-2-x86_64 with default values for all parameters is expected to contain Service[bareos-dir] with hasrestart => false and restart => "systemctl reload bareos-dir"

Failure/Error:
  expect(subject).to contain_service('bareos-dir').with(
    'hasrestart' => false,
    'restart' => 'systemctl reload bareos-dir'
  )

  expected that the catalogue would contain Service[bareos-dir] with restart set to "systemctl reload bareos-dir" but it is set to "service bareos-dir relaod"
expect(subject).to contain_service('bareos-dir').with(
'hasrestart' => false,
'restart' => 'systemctl reload bareos-dir'
)
end
end

context 'with catalogs => { test: { db_driver: "postgresql", db_name: "test" }}}' do
Expand All @@ -36,18 +44,4 @@
end
end
end
context 'on ubuntu-18.04-x86_64' do
let(:facts) do
{ 'service_provider' => 'systemd', }.merge(on_supported_os['ubuntu-18.04-x86_64'])
end

it { is_expected.to compile.with_all_deps }

it do
expect(subject).to contain_service('bareos-dir').with(
'hasrestart' => false,
'restart' => 'systemctl reload bareos-dir'
)
end
end
end
Loading