Skip to content

Commit 3314ff3

Browse files
committed
Feat: Add JDK25 support on Ubuntu 25.04+ and CS9
- Add OpenJDK 25 installation for Ubuntu 25.04 and later - Add Java path configuration for JDK 25 on Debian systems - Fix CentOS 9 compatibility by adding version checks - Remove JDK 8/11 installation on CentOS 9+ (not available) - Fix RedHat version comparisons to use int filter - Standardize apt module usage (ansible.builtin.apt) Supports Ubuntu 24.04, 25.04, 25.10 and CentOS Stream 9. Change-Id: I85e68daed2e0648978f0aefdf16635fe80be1fd8 Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
1 parent 91a0357 commit 3314ff3

File tree

2 files changed

+30
-4
lines changed

2 files changed

+30
-4
lines changed

tasks/Debian.yml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
- ansible_facts['distribution_major_version'] == "11" or ansible_facts['distribution_version'] is version('18.04', '>=')
4242

4343
- name: Install OpenJDK 21
44-
apt:
44+
ansible.builtin.apt:
4545
name:
4646
- openjdk-21-jdk
4747
state: present
@@ -51,6 +51,17 @@
5151
- ansible_facts['os_family'] == "Debian"
5252
- ansible_facts['distribution_major_version'] == "13" or ansible_facts['distribution_version'] is version('20.04', '>=')
5353

54+
- name: Install OpenJDK 25
55+
ansible.builtin.apt:
56+
name:
57+
- openjdk-25-jdk
58+
state: present
59+
update_cache: 'yes'
60+
become: true
61+
when:
62+
- ansible_facts['os_family'] == "Debian"
63+
- ansible_facts['distribution_version'] is version('25.04', '>=')
64+
5465
- name: Set Java path for OpenJDK 11 (non-arm)
5566
ansible.builtin.set_fact:
5667
java_path: /usr/lib/jvm/java-1.11.0-openjdk-amd64
@@ -70,4 +81,14 @@
7081
java_path: /usr/lib/jvm/java-1.21.0-openjdk-amd64
7182
when:
7283
- ansible_facts['architecture'] != "aarch64"
73-
- ansible_facts['os_family'] == 'Debian' and ansible_facts['distribution_version'] is version('20.04', '>=')
84+
- ansible_facts['os_family'] == 'Debian'
85+
- ansible_facts['distribution_version'] is version('20.04', '>=')
86+
- ansible_facts['distribution_version'] is version('25.04', '<')
87+
88+
- name: Set Java path for OpenJDK 25 (non-arm)
89+
ansible.builtin.set_fact:
90+
java_path: /usr/lib/jvm/java-1.25.0-openjdk-amd64
91+
when:
92+
- ansible_facts['architecture'] != "aarch64"
93+
- ansible_facts['os_family'] == 'Debian'
94+
- ansible_facts['distribution_version'] is version('25.04', '>=')

tasks/RedHat.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,17 @@
1414
- java-11-openjdk-devel
1515
state: present
1616
become: true
17+
when: ansible_facts['distribution_major_version'] | int <= 8
1718

1819
- name: Install OpenJDK 17, latest
1920
ansible.builtin.yum:
2021
name:
2122
- java-17-openjdk-devel
2223
- java-latest-openjdk-devel
2324
state: present
24-
when: ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] == "8"
25+
when:
26+
- ansible_facts['os_family'] == "RedHat"
27+
- ansible_facts['distribution_major_version'] | int == 8
2528
become: true
2629

2730
- name: Install OpenJDK 21, latest
@@ -30,7 +33,9 @@
3033
- java-21-openjdk-devel
3134
- java-latest-openjdk-devel
3235
state: present
33-
when: ansible_facts['os_family'] == "RedHat" and ansible_facts['distribution_major_version'] is version('9', '>=')
36+
when:
37+
- ansible_facts['os_family'] == "RedHat"
38+
- ansible_facts['distribution_major_version'] | int >= 9
3439
become: true
3540

3641
- name: Set Java path for OpenJDK 11

0 commit comments

Comments
 (0)