Skip to content

Commit 9225350

Browse files
authored
Ansible: Add JDK24 & JDK25 Boot JDKs for Linux & Windows (adoptium#4245)
* UnixPB: Add JDK24 & JDK25 boot JDKs * WinPB: Add JDK24 & JDK25 boot JDKs
1 parent ff3b194 commit 9225350

File tree

3 files changed

+20
-0
lines changed

3 files changed

+20
-0
lines changed

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,18 @@
159159
- ansible_distribution != "Solaris"
160160
- ansible_architecture != "armv7l"
161161
tags: build_tools
162+
- role: adoptopenjdk_install # JDK25 Build Bootstrap
163+
jdk_version: 24
164+
when:
165+
- ansible_distribution != "Solaris"
166+
- not (ansible_distribution == "Alpine" and ansible_architecture == "aarch64")
167+
tags: build_tools
168+
- role: adoptopenjdk_install # Current LTS
169+
jdk_version: 25
170+
when:
171+
- ansible_distribution != "Solaris"
172+
- not (ansible_distribution == "Alpine" and ansible_architecture == "aarch64")
173+
tags: build_tools
162174
- role: Nagios_Plugins # AdoptOpenJDK Infrastructure
163175
tags: [nagios_plugins, adoptopenjdk]
164176
- riscv_cross_compiler # For building JDK11/J9 on RISC-V architecture

ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
jdk_version: 20
6868
- role: Java_install # Latest LTS, for use by agents
6969
jdk_version: 21
70+
- role: Java_install # Bootstrap for JDK25
71+
jdk_version: 24
72+
- role: Java_install # Latest LTS, for use by agents
73+
jdk_version: 25
7074
- ANT # Testing
7175
- role: MSVS_2013
7276
when: ansible_architecture == "64-bit"

ansible/playbooks/AdoptOpenJDK_Windows_Playbook/windows_with_ssh.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@
7474
jdk_version: 20
7575
- role: Java_install # Latest LTS, for use by agents
7676
jdk_version: 21
77+
- role: Java_install # Bootstrap for JDK25
78+
jdk_version: 24
79+
- role: Java_install # Latest LTS, for use by agents
80+
jdk_version: 25
7781
- ANT # Testing
7882
- role: MSVS_2022
7983
tags: MSVS_2022

0 commit comments

Comments
 (0)