From 0f62511112aee8bd907e16fcbde797edd273b43a Mon Sep 17 00:00:00 2001
From: Mark Vieira <portugee@gmail.com>
Date: Wed, 27 Oct 2021 15:45:26 -0700
Subject: [PATCH] Use correct Java locations for AARCH64 CI builds

---
 .ci/java-versions-aarch64.properties                            | 2 +-
 .../elastic+elasticsearch+multijob+platform-support-arm.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.ci/java-versions-aarch64.properties b/.ci/java-versions-aarch64.properties
index 387321e381594..5486287ed0b59 100644
--- a/.ci/java-versions-aarch64.properties
+++ b/.ci/java-versions-aarch64.properties
@@ -5,4 +5,4 @@
 # are 'java' or 'openjdk' followed by the major release number.
 
 ES_BUILD_JAVA=jdk16
-ES_RUNTIME_JAVA=jdk16
+ES_RUNTIME_JAVA=jdk17
diff --git a/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-arm.yml b/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-arm.yml
index 20954708ffe9c..5cd63e0e0b980 100644
--- a/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-arm.yml
+++ b/.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-arm.yml
@@ -23,7 +23,7 @@
             COMPOSE_HTTP_TIMEOUT=120
             JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
             RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
-            JAVA11_HOME=$HOME/.java/java11
+            JAVA11_HOME=$HOME/.java/jdk11
             JAVA15_HOME=$HOME/.java/jdk15
       - shell: |
           #!/usr/local/bin/runbld --redirect-stderr