Skip to content

Commit 00c7eb1

Browse files
committed
Support Debian 12
1 parent bd970c9 commit 00c7eb1

File tree

3 files changed

+23
-1
lines changed

3 files changed

+23
-1
lines changed

manifests/params.pp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
default => $facts['os']['architecture']
5959
}
6060
case $facts['os']['release']['major'] {
61+
'12': {
62+
$openjdk = 17
63+
}
6164
'10', '11', '18.04', '18.10', '19.04', '19.10', '20.04', '22.04': {
6265
$openjdk = 11
6366
}

metadata.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
"operatingsystem": "Debian",
4444
"operatingsystemrelease": [
4545
"10",
46-
"11"
46+
"11",
47+
"12"
4748
]
4849
},
4950
{

spec/classes/java_spec.rb

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,24 @@
2828
end
2929
end
3030

31+
context 'on Debian Bookworm (12)' do
32+
let(:facts) { { os: { family: 'Debian', name: 'Debian', lsb: { distcodename: 'bookworm' }, release: { major: '12' }, architecture: 'amd64' } } }
33+
34+
context 'when selecting jdk' do
35+
let(:params) { { 'distribution' => 'jdk' } }
36+
37+
it { is_expected.to contain_package('java').with_name('openjdk-17-jdk') }
38+
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.17.0-openjdk-amd64/') }
39+
end
40+
41+
context 'when selecting jre' do
42+
let(:params) { { 'distribution' => 'jre' } }
43+
44+
it { is_expected.to contain_package('java').with_name('openjdk-17-jre-headless') }
45+
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.17.0-openjdk-amd64/') }
46+
end
47+
end
48+
3149
context 'on Ubuntu Bionic (18.04)' do
3250
let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'bionic' }, release: { major: '18.04' }, architecture: 'amd64' } } }
3351

0 commit comments

Comments
 (0)