From 411832aa170c8855b61bd6c08545a7b700d5f175 Mon Sep 17 00:00:00 2001
From: Thomas Farr <tsfarr@amazon.com>
Date: Tue, 9 Jul 2024 02:18:39 +1200
Subject: [PATCH] Fix building of OpenSearch 3.0.0-SNAPSHOT/main by installing
 JDK 21 (#694)

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
(cherry picked from commit 8c05271081f53af32545bd1b0017d114e120f2d8)
---
 .github/actions/start-opensearch/action.yml  | 9 ++-------
 .github/workflows/integration-yaml-tests.yml | 6 ++++++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/actions/start-opensearch/action.yml b/.github/actions/start-opensearch/action.yml
index 8e4eb154e5..02dd2b613c 100644
--- a/.github/actions/start-opensearch/action.yml
+++ b/.github/actions/start-opensearch/action.yml
@@ -14,12 +14,6 @@ outputs:
 runs:
   using: composite
   steps:
-    - name: Install Java
-      uses: actions/setup-java@v3
-      with:
-        distribution: zulu
-        java-version: 11
-
     - name: Start OpenSearch
       id: opensearch
       shell: bash -eo pipefail {0}
@@ -27,6 +21,7 @@ runs:
         if [[ "$RUNNER_OS" == "macOS" ]]; then
           brew install -q coreutils
         fi
+        unset JAVA_HOME
         OPENSEARCH_HOME=$(realpath ./opensearch-[1-9]*)
         CONFIG_DIR=$OPENSEARCH_HOME/config
         CONFIG_FILE=$CONFIG_DIR/opensearch.yml
@@ -48,7 +43,7 @@ runs:
             SECURITY_MINOR="${SECURITY_VERSION_COMPONENTS[1]}"
         
             if (( $SECURITY_MAJOR > 2 || ( $SECURITY_MAJOR == 2 && $SECURITY_MINOR >= 12 ) )); then
-              export OPENSEARCH_INITIAL_ADMIN_PASSWORD=$(LC_ALL=C tr -dc A-Za-z0-9 </dev/urandom | head -c 16)
+              export OPENSEARCH_INITIAL_ADMIN_PASSWORD="myStrongPassword123!"
             fi
         
             bash "$SECURITY_DIR/tools/install_demo_configuration.sh" -y -i -s
diff --git a/.github/workflows/integration-yaml-tests.yml b/.github/workflows/integration-yaml-tests.yml
index b8799a62fe..d426b21f66 100644
--- a/.github/workflows/integration-yaml-tests.yml
+++ b/.github/workflows/integration-yaml-tests.yml
@@ -104,6 +104,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-nuget-
 
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'temurin'
+
       - name: Restore or Build OpenSearch
         id: opensearch_build
         uses: ./client/.github/actions/build-opensearch