From 4c316fc6f11bf57f25044d2b4831d81177472373 Mon Sep 17 00:00:00 2001
From: Peter Zhu <zhujiaxi@amazon.com>
Date: Tue, 11 Mar 2025 21:39:24 +0000
Subject: [PATCH] Reset jdk to 21 for test manifests and windows runner
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
---
docker/ci/config/windows-setup.ps1 | 4 ++--
manifests/3.0.0-alpha1/opensearch-3.0.0-alpha1-test.yml | 2 +-
manifests/3.0.0-beta1/opensearch-3.0.0-beta1-test.yml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docker/ci/config/windows-setup.ps1 b/docker/ci/config/windows-setup.ps1
index 4a413c48ba..a407ae80ae 100644
--- a/docker/ci/config/windows-setup.ps1
+++ b/docker/ci/config/windows-setup.ps1
@@ -105,8 +105,8 @@ Foreach ($jdkVersion in $jdkVersionList)
[System.Environment]::SetEnvironmentVariable($jdkArray[1], "$JAVA_HOME_TEMP", [System.EnvironmentVariableTarget]::User)
java -version
}
-# Switch to temurin11-jdk as it is the widest supported version to build OpenSearch
-scoop reset temurin11-jdk
+# Switch to temurin21-jdk as 3.0.0 is baselined to 21
+scoop reset temurin21-jdk
$JAVA_HOME_TEMP = [System.Environment]::GetEnvironmentVariable("JAVA_HOME", [System.EnvironmentVariableTarget]::User).replace("\", "/")
$JAVA_HOME_TEMP
[System.Environment]::SetEnvironmentVariable('JAVA_HOME', "$JAVA_HOME_TEMP", [System.EnvironmentVariableTarget]::User)
diff --git a/manifests/3.0.0-alpha1/opensearch-3.0.0-alpha1-test.yml b/manifests/3.0.0-alpha1/opensearch-3.0.0-alpha1-test.yml
index 9c5292c5b3..c3ea6da8b2 100644
--- a/manifests/3.0.0-alpha1/opensearch-3.0.0-alpha1-test.yml
+++ b/manifests/3.0.0-alpha1/opensearch-3.0.0-alpha1-test.yml
@@ -4,7 +4,7 @@ name: OpenSearch
ci:
image:
name: opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1
- args: -e JAVA_HOME=/opt/java/openjdk-23
+ args: -e JAVA_HOME=/opt/java/openjdk-21
components:
- name: OpenSearch
integ-test:
diff --git a/manifests/3.0.0-beta1/opensearch-3.0.0-beta1-test.yml b/manifests/3.0.0-beta1/opensearch-3.0.0-beta1-test.yml
index cae3fd73cc..18fe26327a 100644
--- a/manifests/3.0.0-beta1/opensearch-3.0.0-beta1-test.yml
+++ b/manifests/3.0.0-beta1/opensearch-3.0.0-beta1-test.yml
@@ -4,7 +4,7 @@ name: OpenSearch
ci:
image:
name: opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1
- args: -e JAVA_HOME=/opt/java/openjdk-23
+ args: -e JAVA_HOME=/opt/java/openjdk-21
components:
- name: OpenSearch
integ-test: