From 98446cab22df836c1705cab5e16dad5a30c5ae0c Mon Sep 17 00:00:00 2001 From: dzmitry-rudnouski Date: Thu, 4 Jun 2026 17:07:18 +0300 Subject: [PATCH 1/5] Add corretto fallback tests to CI pipeline Add GitHub Actions tests for Amazon Corretto 8 and 11 using fallback transport, following the pattern established by zulu tests. Co-Authored-By: Claude Haiku 4.5 --- .github/workflows/build.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f827e06a..e64b2b4c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -88,3 +88,25 @@ jobs: run: | cd .. ansible-playbook ansible-role-java/playbook.yml -e "java_major_version=${{ matrix.java_version }} java_distribution=zulu" + corretto-fallback: + strategy: + matrix: + java_version: + - '11' + - '8' + runs-on: ubuntu-22.04 + steps: + - name: Checkout + uses: actions/checkout@v4.1.7 + with: + fetch-depth: 0 + - name: Install ansible + run: | + sudo apt-add-repository --yes --update ppa:ansible/ansible + sudo apt-get update + sudo apt-get install ansible -y + ansible --version + - name: Run playbook + run: | + cd .. + ansible-playbook ansible-role-java/playbook.yml -e "java_major_version=${{ matrix.java_version }} java_distribution=corretto" From 93a1e661ddd010fc1bf74fa7f322c97dec26e69f Mon Sep 17 00:00:00 2001 From: dzmitry-rudnouski Date: Thu, 4 Jun 2026 17:12:36 +0300 Subject: [PATCH 2/5] Expand corretto fallback tests to include Java 17, 21, 25 Test additional Java versions in corretto-fallback CI job for broader coverage. Co-Authored-By: Claude Haiku 4.5 --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e64b2b4c..ca3a7be4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -92,6 +92,9 @@ jobs: strategy: matrix: java_version: + - '25' + - '21' + - '17' - '11' - '8' runs-on: ubuntu-22.04 From 1510f0a11a11296d2324f4cd5fc6d16d715b3674 Mon Sep 17 00:00:00 2001 From: dzmitry-rudnouski Date: Thu, 4 Jun 2026 17:19:17 +0300 Subject: [PATCH 3/5] Remove Java version check for Corretto fallback transport Allow testing of additional Corretto versions (17, 21, 25) beyond the previously supported 8 and 11. Co-Authored-By: Claude Haiku 4.5 --- tasks/Linux/fetch/corretto-fallback.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tasks/Linux/fetch/corretto-fallback.yml b/tasks/Linux/fetch/corretto-fallback.yml index 8c556b4f..814f10f6 100644 --- a/tasks/Linux/fetch/corretto-fallback.yml +++ b/tasks/Linux/fetch/corretto-fallback.yml @@ -1,11 +1,4 @@ --- -- name: Check requested major version for Corretto - fail: - msg: Supported versions of Amazon Corretto only 8 and 11 - when: - - java_major_version|int != 8 - - java_major_version|int != 11 - - name: Check requested architecture for Corretto fail: msg: Amazon Corretto currently supports x64 platform only From 7f1dea10add3d53b1c7e28c701cd1c2572f5dce6 Mon Sep 17 00:00:00 2001 From: dzmitry-rudnouski Date: Thu, 4 Jun 2026 17:34:50 +0300 Subject: [PATCH 4/5] Add Java version verification step to all test jobs Output installed Java version in each CI test to verify correct installation. Co-Authored-By: Claude Haiku 4.5 --- .github/workflows/build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca3a7be4..b89ab4fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,6 +39,8 @@ jobs: run: | cd .. ansible-playbook ansible-role-java/playbook.yml -e "java_major_version=25" + - name: Verify Java installation + run: java -version openjdk-repo: strategy: matrix: @@ -63,6 +65,8 @@ jobs: run: | cd .. ansible-playbook ansible-role-java/playbook.yml -e "java_major_version=${{ matrix.java_version }} transport=repositories" + - name: Verify Java installation + run: java -version zulu-fallback: strategy: matrix: @@ -88,6 +92,8 @@ jobs: run: | cd .. ansible-playbook ansible-role-java/playbook.yml -e "java_major_version=${{ matrix.java_version }} java_distribution=zulu" + - name: Verify Java installation + run: java -version corretto-fallback: strategy: matrix: @@ -113,3 +119,5 @@ jobs: run: | cd .. ansible-playbook ansible-role-java/playbook.yml -e "java_major_version=${{ matrix.java_version }} java_distribution=corretto" + - name: Verify Java installation + run: java -version From 1da94abedcd828022be2d06213f38574a0f53c8f Mon Sep 17 00:00:00 2001 From: dzmitry-rudnouski Date: Thu, 4 Jun 2026 17:48:56 +0300 Subject: [PATCH 5/5] Update README.md to reflect Corretto support for Java 17, 21, 25 Move Amazon Corretto section earlier in documentation and update supported versions from 8, 11 to 8, 11, 17, 21, 25. Co-Authored-By: Claude Haiku 4.5 --- README.md | 84 ++++++++++++++++++++++++------------------------------- 1 file changed, 37 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index 19785761..2e83b10b 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,12 @@ This Ansible role has the following features for: - Install JDK - Additional opportunity to install from zulu-fallback, s3, web, local source, chocolatey. +**Amazon Corretto** + +- Install JDK 8, 11, 17, 21, 25 +- Install JRE 8 (Amazon Linux 2 only) +- Additional opportunity to install from fallback, web, local source, s3. + **Oracle Java:** - Install JRE, JDK, Server-JRE @@ -47,12 +53,6 @@ This Ansible role has the following features for: - Linux/x86_64 platform only - Additional opportunity to install from dragonwell8-fallback, web, local source, s3. -**Amazon Corretto** - -- Install JDK 8 and 11 -- Install JRE 8 (Amazon Linux 2 only) -- Additional opportunity to install from fallback, web, local source, s3. - Requirements ------------ @@ -81,6 +81,12 @@ Requirements - 17 - 21 - 25 + - **Supported Amazon Corretto version**: + - 8 + - 11 + - 17 + - 21 + - 25 - **Supported oracle java version**: - 7 - 8 @@ -116,9 +122,6 @@ Requirements - **Supported Alibaba Dragonwell version**: - 8.0.0 - 8.1.1 - - **Supported Amazon Corretto version**: - - 8 - - 11 - **Supported OS**: - Ubuntu - bionic @@ -314,6 +317,31 @@ Example Playbook java_distribution: zulu ``` +### Installing Amazon Corretto JDK 25, 21, 17, 11, 8 from corretto-fallback: + +```yaml +- name: Install Amazon Corretto + hosts: all + + roles: + - role: lean_delivery.java + java_major_version: 25 + java_distribution: corretto +``` + +### Installing Amazon Corretto JDK 11 on Ubuntu 18.04 from web: + +```yaml +- name: Install Amazon Corretto + hosts: all + + roles: + - role: lean_delivery.java + java_distribution: corretto + transport: web + transport_web: https://d3pxv6yz143wms.cloudfront.net/11.0.5.10.1/amazon-corretto-11.0.5.10.1-linux-x64.tar.gz +``` + ### Installing Oracle java 8 from local file: ```yaml - name: Install oracle java @@ -397,44 +425,6 @@ https://docs.ansible.com/ansible/latest/modules/aws_s3_module.html#requirements transport: fallback java_major_version: 8 ``` -### Installing Amazon Corretto JDK 8 from corretto-fallback: - -```yaml -- name: Install Amazon Corretto - hosts: all - - roles: - - role: lean_delivery.java - java_distribution: corretto - transport: fallback - java_major_version: 8 -``` - -### Installing Amazon Corretto JDK 11 from repo on Amazon Linux 2: - -```yaml -- name: Install Amazon Corretto - hosts: all - - roles: - - role: lean_delivery.java - java_distribution: corretto - transport: repositories - java_major_version: 11 -``` - -### Installing Amazon Corretto JDK 11 on Ubuntu 18.04 from web: - -```yaml -- name: Install Amazon Corretto - hosts: all - - roles: - - role: lean_delivery.java - java_distribution: corretto - transport: web - transport_web: https://d3pxv6yz143wms.cloudfront.net/11.0.5.10.1/amazon-corretto-11.0.5.10.1-linux-x64.tar.gz -``` License -------