From: Anil Belur <abelur@linuxfoundation.org>
Date: Mon, 18 Dec 2023 02:00:25 +0000 (+1000)
Subject: Feat: Install OpenJDK 21 on Ubuntu
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F11%2F72511%2F9;p=ansible%2Froles%2Fjava-install.git

Feat: Install OpenJDK 21 on Ubuntu

- Install JDK21 on Ubuntu {20,22}.04

Change-Id: Ia03ed4fa880b9ddedb8754c75922833579437543
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index bce15f1..c2b2c93 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -14,6 +14,8 @@ platforms:
     image: ubuntu:18.04
   - name: ubuntu2004
     image: ubuntu:20.04
+  - name: ubuntu2204
+    image: ubuntu:22.04
 provisioner:
   name: ansible
 scenario:
diff --git a/tasks/Debian.yml b/tasks/Debian.yml
index 2986cbd..4e08744 100644
--- a/tasks/Debian.yml
+++ b/tasks/Debian.yml
@@ -37,17 +37,36 @@
   become: true
   when:
     - ansible_os_family == "Debian"
-    - ansible_distribution_major_version == "11" or ansible_distribution_version == "20.04" or
-      ansible_distribution_version == "18.04"
+    - ansible_distribution_major_version == "11" or ansible_distribution_version >= "18.04"
+
+- name: Install OpenJDK 21
+  apt:
+    name:
+      - openjdk-21-jdk
+    state: present
+    update_cache: 'yes'
+  become: true
+  when:
+    - ansible_os_family == "Debian"
+    - ansible_distribution_major_version == "13" or ansible_distribution_version == "20.04" or
+      ansible_distribution_version == "22.04"
 
 - name: Set Java path for OpenJDK 11 (non-arm)
   ansible.builtin.set_fact:
     java_path: /usr/lib/jvm/java-1.11.0-openjdk-amd64
   when:
     - ansible_architecture != "aarch64"
+    - ansible_os_family == 'Debian' and ansible_facts['distribution_major_version'] is version('20.04', '<=')
 
 - name: Set Java path for OpenJDK 11 (arm)
   ansible.builtin.set_fact:
     java_path: /usr/lib/jvm/java-1.11.0-openjdk-arm64
   when:
     - ansible_architecture == "aarch64"
+
+- name: Set Java path for OpenJDK 21 (non-arm)
+  ansible.builtin.set_fact:
+    java_path: /usr/lib/jvm/java-1.21.0-openjdk-amd64
+  when:
+    - ansible_architecture != "aarch64"
+    - ansible_os_family == 'Debian' and ansible_facts['distribution_major_version'] is version('20.04', '>=')