Skip to content

Commit 4c316fc

Browse files
Reset jdk to 21 for test manifests and windows runner
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
1 parent 024138d commit 4c316fc

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

docker/ci/config/windows-setup.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ Foreach ($jdkVersion in $jdkVersionList)
105105
[System.Environment]::SetEnvironmentVariable($jdkArray[1], "$JAVA_HOME_TEMP", [System.EnvironmentVariableTarget]::User)
106106
java -version
107107
}
108-
# Switch to temurin11-jdk as it is the widest supported version to build OpenSearch
109-
scoop reset temurin11-jdk
108+
# Switch to temurin21-jdk as 3.0.0 is baselined to 21
109+
scoop reset temurin21-jdk
110110
$JAVA_HOME_TEMP = [System.Environment]::GetEnvironmentVariable("JAVA_HOME", [System.EnvironmentVariableTarget]::User).replace("\", "/")
111111
$JAVA_HOME_TEMP
112112
[System.Environment]::SetEnvironmentVariable('JAVA_HOME', "$JAVA_HOME_TEMP", [System.EnvironmentVariableTarget]::User)

manifests/3.0.0-alpha1/opensearch-3.0.0-alpha1-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: OpenSearch
44
ci:
55
image:
66
name: opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1
7-
args: -e JAVA_HOME=/opt/java/openjdk-23
7+
args: -e JAVA_HOME=/opt/java/openjdk-21
88
components:
99
- name: OpenSearch
1010
integ-test:

manifests/3.0.0-beta1/opensearch-3.0.0-beta1-test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: OpenSearch
44
ci:
55
image:
66
name: opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1
7-
args: -e JAVA_HOME=/opt/java/openjdk-23
7+
args: -e JAVA_HOME=/opt/java/openjdk-21
88
components:
99
- name: OpenSearch
1010
integ-test:

0 commit comments

Comments
 (0)