Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reset jdk to 21 for test manifests and windows runner #5391

Merged
merged 1 commit into from
Mar 11, 2025
Merged

Reset jdk to 21 for test manifests and windows runner #5391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/ci/config/windows-setup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion manifests/3.0.0-alpha1/opensearch-3.0.0-alpha1-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion manifests/3.0.0-beta1/opensearch-3.0.0-beta1-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down