|
| 1 | +From 76c39627ebc114913e532474f0c4e98c4fed3d14 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Michael Prokop < [email protected]> |
| 3 | +Date: Tue, 2 Sep 2025 12:14:35 +0200 |
| 4 | +Subject: [PATCH] Add support for Debian 13 (trixie) |
| 5 | + |
| 6 | +Debian v13 AKA trixie was released on 2025-08-09 as Debian's new stable |
| 7 | +release. |
| 8 | +--- |
| 9 | + manifests/params.pp | 3 +++ |
| 10 | + metadata.json | 3 ++- |
| 11 | + spec/classes/java_spec.rb | 18 ++++++++++++++++++ |
| 12 | + 3 files changed, 23 insertions(+), 1 deletion(-) |
| 13 | + |
| 14 | +diff --git a/manifests/params.pp b/manifests/params.pp |
| 15 | +index 708d3e6f..fa352809 100644 |
| 16 | +--- a/manifests/params.pp |
| 17 | ++++ b/manifests/params.pp |
| 18 | +@@ -58,6 +58,9 @@ |
| 19 | + default => $facts['os']['architecture'] |
| 20 | + } |
| 21 | + case $facts['os']['release']['major'] { |
| 22 | ++ '13': { |
| 23 | ++ $openjdk = 21 |
| 24 | ++ } |
| 25 | + '12', '24.04': { |
| 26 | + $openjdk = 17 |
| 27 | + } |
| 28 | +diff --git a/metadata.json b/metadata.json |
| 29 | +index 40bd8099..d1866765 100644 |
| 30 | +--- a/metadata.json |
| 31 | ++++ b/metadata.json |
| 32 | +@@ -44,7 +44,8 @@ |
| 33 | + "operatingsystemrelease": [ |
| 34 | + "10", |
| 35 | + "11", |
| 36 | +- "12" |
| 37 | ++ "12", |
| 38 | ++ "13" |
| 39 | + ] |
| 40 | + }, |
| 41 | + { |
| 42 | +diff --git a/spec/classes/java_spec.rb b/spec/classes/java_spec.rb |
| 43 | +index 90efa9f5..dd51a098 100644 |
| 44 | +--- a/spec/classes/java_spec.rb |
| 45 | ++++ b/spec/classes/java_spec.rb |
| 46 | +@@ -46,6 +46,24 @@ |
| 47 | + end |
| 48 | + end |
| 49 | + |
| 50 | ++ context 'on Debian Trixie (13)' do |
| 51 | ++ let(:facts) { { os: { family: 'Debian', name: 'Debian', lsb: { distcodename: 'trixie' }, release: { major: '13' }, architecture: 'amd64' } } } |
| 52 | ++ |
| 53 | ++ context 'when selecting jdk' do |
| 54 | ++ let(:params) { { 'distribution' => 'jdk' } } |
| 55 | ++ |
| 56 | ++ it { is_expected.to contain_package('java').with_name('openjdk-21-jdk') } |
| 57 | ++ it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.21.0-openjdk-amd64/') } |
| 58 | ++ end |
| 59 | ++ |
| 60 | ++ context 'when selecting jre' do |
| 61 | ++ let(:params) { { 'distribution' => 'jre' } } |
| 62 | ++ |
| 63 | ++ it { is_expected.to contain_package('java').with_name('openjdk-21-jre-headless') } |
| 64 | ++ it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.21.0-openjdk-amd64/') } |
| 65 | ++ end |
| 66 | ++ end |
| 67 | ++ |
| 68 | + context 'on Ubuntu Bionic (18.04)' do |
| 69 | + let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'bionic' }, release: { major: '18.04' }, architecture: 'amd64' } } } |
| 70 | + |
0 commit comments