From ddda10d05e97c3454544ea46ebd465a31e45dfae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20Gonz=C3=A1lez=20Serrano?= Date: Tue, 18 Jul 2023 19:51:06 +0200 Subject: [PATCH] Add support for Debian 12 (Bookworm) --- manifests/params.pp | 16 ++++++++++++++++ metadata.json | 3 ++- spec/classes/java_spec.rb | 8 ++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/manifests/params.pp b/manifests/params.pp index d60bb5ca..af934342 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -89,6 +89,22 @@ }, } } + '12': { + $java = { + 'jdk' => { + 'package' => 'openjdk-17-jdk', + 'alternative' => "java-1.17.0-openjdk-${openjdk_architecture}", + 'alternative_path' => "/usr/lib/jvm/java-1.17.0-openjdk-${openjdk_architecture}/bin/java", + 'java_home' => "/usr/lib/jvm/java-1.17.0-openjdk-${openjdk_architecture}/", + }, + 'jre' => { + 'package' => 'openjdk-17-jre-headless', + 'alternative' => "java-1.17.0-openjdk-${openjdk_architecture}", + 'alternative_path' => "/usr/lib/jvm/java-1.17.0-openjdk-${openjdk_architecture}/bin/java", + 'java_home' => "/usr/lib/jvm/java-1.17.0-openjdk-${openjdk_architecture}/", + }, + } + } '10', '11', '18.04', '18.10', '19.04', '19.10', '20.04', '22.04': { $java = { 'jdk' => { diff --git a/metadata.json b/metadata.json index 540e1cfe..0478e5c9 100644 --- a/metadata.json +++ b/metadata.json @@ -43,7 +43,8 @@ "operatingsystem": "Debian", "operatingsystemrelease": [ "10", - "11" + "11", + "12" ] }, { diff --git a/spec/classes/java_spec.rb b/spec/classes/java_spec.rb index 61f357fb..fd24225f 100644 --- a/spec/classes/java_spec.rb +++ b/spec/classes/java_spec.rb @@ -85,6 +85,14 @@ it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64/') } end + context 'when selecting jre for Debian Bookworm (12.0)' do + let(:facts) { { os: { family: 'Debian', name: 'Debian', lsb: { distcodename: 'bookworm' }, release: { major: '12' }, architecture: 'amd64' } } } + let(:params) { { 'distribution' => 'jre' } } + + it { is_expected.to contain_package('java').with_name('openjdk-17-jre-headless') } + it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.17.0-openjdk-amd64/') } + end + context 'when selecting jdk for Ubuntu Bionic (18.04)' do let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'bionic' }, release: { major: '18.04' }, architecture: 'amd64' } } } let(:params) { { 'distribution' => 'jdk' } }