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

Jump to bottom

Support Debian 11 #108

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

Support Debian 11 #108

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8599229
Support Debian 11
FlorentPoinsaut Mar 14, 2022
8543460
Use versioncmp instead of >=
FlorentPoinsaut Mar 14, 2022
dad103b
add debian version and bareos version compatibility check
FlorentPoinsaut Mar 14, 2022
812ae9f
Merge branch 'master' into FlorentPoinsaut-patch-2
FlorentPoinsaut Mar 14, 2022
7d5719c
Add Debian 11 compatibility mention
FlorentPoinsaut Mar 14, 2022
16c5559
fix unit test
FlorentPoinsaut Mar 15, 2022
50bca89
Fix Debian 11 unit test
FlorentPoinsaut Mar 16, 2022
2e42adb
add release param depends on OS version
FlorentPoinsaut Mar 16, 2022
cbb7ca5
add compatibility of Debian 11 with Bareos 20
FlorentPoinsaut Mar 16, 2022
fbaa120
Merge branch 'master' into FlorentPoinsaut-patch-2
FlorentPoinsaut May 11, 2023
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
6 changes: 5 additions & 1 deletion manifests/repository.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,11 @@
}
$location = "${url}xUbuntu_${osrelease}"
} else {
if $osmajrelease == '10' {
if versioncmp($osmajrelease, '10') >= 0 {
if (versioncmp($release, '18.2') <= 0)
or ((versioncmp($release, '20') <= 0) and (versioncmp($osmajrelease, '11') >= 0)) {
fail("Bareos ${release} is not distributed for Debian ${osmajrelease}")
}
$location = "${url}Debian_${osmajrelease}"
} else {
$location = "${url}Debian_${osmajrelease}.0"
Expand Down
3 changes: 2 additions & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@
"operatingsystem": "Debian",
"operatingsystemrelease": [
"9",
"10"
"10",
"11"
]
},
{
Expand Down
11 changes: 9 additions & 2 deletions spec/classes/repository_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,15 @@
end

context 'with default values for all parameters' do
it { is_expected.to compile.with_all_deps }
it { is_expected.to contain_class('bareos::repository') }
if (facts[:osfamily] == 'Debian') && (facts[:operatingsystemmajrelease] == '11')
it 'fails' do
expect { is_expected.to contain_class('bareos::repository') }.
to raise_error(Puppet::PreformattedError, %r{is not distributed for})
end
FlorentPoinsaut marked this conversation as resolved.
Show resolved Hide resolved
else
it { is_expected.to compile.with_all_deps }
it { is_expected.to contain_class('bareos::repository') }
end
end

case facts[:osfamily]
Expand Down