Skip to content

Commit

Permalink
Merge pull request #152 from zilchms/dropubuntu
Browse files Browse the repository at this point in the history
Drop Ubuntu 16.04 and 18.04 support
  • Loading branch information
zilchms authored Feb 23, 2024
2 parents 3aecf7f + c6f8c84 commit de6086e
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 19 deletions.
3 changes: 0 additions & 3 deletions manifests/repository.pp
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,6 @@
$url = "${scheme}${address}"
}
if $os == 'Ubuntu' {
unless $osrelease in ['12.04', '14.04', '16.04', '18.04', '20.04'] {
fail('Only Ubunutu LTS Versions are supported')
}
$location = "${url}xUbuntu_${osrelease}"
} else {
if $osmajrelease == '10' {
Expand Down
2 changes: 0 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"16.04",
"18.04",
"20.04"
]
},
Expand Down
15 changes: 1 addition & 14 deletions spec/classes/director_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

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') }
end

Expand All @@ -36,18 +37,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

0 comments on commit de6086e

Please sign in to comment.