From f493b0f2e3a053fbd3bedce186fe05ad4f89b26a Mon Sep 17 00:00:00 2001
From: Geoff Jacobs <gjacobs@atlassian.com>
Date: Thu, 29 Aug 2024 09:05:52 +1000
Subject: [PATCH] ITPLT-4019 Backwards compatible change to allow testing of
 Corretto JDK on AZL2023

---
 roles/product_common/defaults/main.yml     |  1 +
 roles/product_common/tasks/amazon-2023.yml | 26 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/roles/product_common/defaults/main.yml b/roles/product_common/defaults/main.yml
index 2326b18..9c6d676 100644
--- a/roles/product_common/defaults/main.yml
+++ b/roles/product_common/defaults/main.yml
@@ -5,6 +5,7 @@ postgres_version: "9.6"
 # Disable these when using the product installer, otherwise we end up
 # fighting with it.
 atl_use_system_jdk: false
+atl_use_system_jdk_flavor: "temurin"  # amazon linux 2023 also supports "corretto"
 
 # Ubuntu and Ansible use different architecture nomenclature; provide
 # an easy method for translating between them
diff --git a/roles/product_common/tasks/amazon-2023.yml b/roles/product_common/tasks/amazon-2023.yml
index c10bd85..d34793f 100644
--- a/roles/product_common/tasks/amazon-2023.yml
+++ b/roles/product_common/tasks/amazon-2023.yml
@@ -1,5 +1,5 @@
 ---
-
+# Temurin JDK installation
 - name: Add Adoptium repo and install Eclipse Temurin JDK if necessary on Amazon Linux 2023
   block:
 
@@ -124,10 +124,32 @@
         path: "/usr/lib/jvm/temurin-{{ java_major_version }}-jdk"
         priority: 99
 
-  when: atl_use_system_jdk | bool
+  when:
+    - atl_use_system_jdk | bool
+    - atl_use_system_jdk_flavor == "temurin"
   tags:
     - runtime_pkg
 
+# Corretto JDK installation
+- name: Install Corretto JDK if necessary on Amazon Linux 2023
+  block:
+    - name: Install Corretto JDK Headless
+      ansible.builtin.dnf:
+        name: "java-{{ java_major_version }}-amazon-corretto-headless"
+        state: present
+      tags:
+        - runtime_pkg
+
+    - name: Ensure common JDK symlink exists
+      community.general.alternatives:
+        link: "/usr/lib/jvm/java"
+        name: "java_sdk"
+        path: "/usr/lib/jvm/java-{{ java_major_version }}-amazon-corretto"
+        priority: 99
+  when:
+    - atl_use_system_jdk | bool
+    - atl_use_system_jdk_flavor == "corretto"
+
 - name: Install other base packages on Amazon Linux 2023
   ansible.builtin.dnf:
     name: