Skip to content

Update 3.2.0 manifest to use jdk24 #5627

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

Merged
peterzhuamazon merged 3 commits into from
Jul 7, 2025
Merged

Update 3.2.0 manifest to use jdk24 #5627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e97e9e2
Update 3.2.0 manifest to use jdk24
peterzhuamazon Jul 7, 2025
5f317aa
Update 3.2.0 manifest to use jdk24
peterzhuamazon Jul 7, 2025
d3d9b9e
Resolve test issues
peterzhuamazon Jul 7, 2025
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
2 changes: 1 addition & 1 deletion manifests/3.2.0/opensearch-3.2.0-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-21
args: -e JAVA_HOME=/opt/java/openjdk-24
components:
- name: OpenSearch
integ-test:
Expand Down
8 changes: 4 additions & 4 deletions manifests/3.2.0/opensearch-3.2.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ ci:
linux:
tar:
name: opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1
args: -e JAVA_HOME=/opt/java/openjdk-21
args: -e JAVA_HOME=/opt/java/openjdk-24
deb:
name: opensearchstaging/ci-runner:ci-runner-ubuntu2404-opensearch-build-v1
args: -e JAVA_HOME=/opt/java/openjdk-21
args: -e JAVA_HOME=/opt/java/openjdk-24
rpm:
name: opensearchstaging/ci-runner:ci-runner-almalinux8-opensearch-build-v1
args: -e JAVA_HOME=/opt/java/openjdk-21
args: -e JAVA_HOME=/opt/java/openjdk-24
windows:
zip:
name: opensearchstaging/ci-runner:ci-runner-windows2019-opensearch-build-v1
args: -e JAVA_HOME=/opt/java/openjdk-21
args: -e JAVA_HOME=/opt/java/openjdk-24
components:
- name: OpenSearch
repository: https://github.com/opensearch-project/OpenSearch.git
Expand Down
2 changes: 1 addition & 1 deletion manifests/templates/opensearch/3.x/manifest-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-21
args: -e JAVA_HOME=/opt/java/openjdk-24
components:
- name: index-management
integ-test:
Expand Down
2 changes: 1 addition & 1 deletion manifests/templates/opensearch/3.x/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ci:
linux:
tar:
name: opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1
args: -e JAVA_HOME=/opt/java/openjdk-21
args: -e JAVA_HOME=/opt/java/openjdk-24
components:
- name: OpenSearch
repository: https://github.com/opensearch-project/OpenSearch.git
Expand Down
2 changes: 1 addition & 1 deletion manifests/templates/opensearch/default/manifest-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-21
args: -e JAVA_HOME=/opt/java/openjdk-24
components:
- name: index-management
integ-test:
Expand Down
8 changes: 5 additions & 3 deletions manifests/templates/opensearch/default/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
---
schema-version: '1.1'
schema-version: '1.2'
build:
name: OpenSearch
version: 'replace'
ci:
image:
name: opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1
args: -e JAVA_HOME=/opt/java/openjdk-21
linux:
tar:
name: opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1
args: -e JAVA_HOME=/opt/java/openjdk-24
components:
- name: OpenSearch
repository: https://github.com/opensearch-project/OpenSearch.git
Expand Down
2 changes: 1 addition & 1 deletion tests/tests_manifests/test_input_manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def test_3_1_0_ci_images(self) -> None:
self.assertEqual(manifest.build.filename, "opensearch")
self.assertEqual(manifest.build.version, "replace")
self.assertEqual(manifest.ci.image["linux"]["tar"].name, "opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1")
self.assertEqual(manifest.ci.image["linux"]["tar"].args, "-e JAVA_HOME=/opt/java/openjdk-21")
self.assertEqual(manifest.ci.image["linux"]["tar"].args, "-e JAVA_HOME=/opt/java/openjdk-24")

def test_plugins_depend_on(self) -> None:
path = os.path.join(self.manifests_path, "templates", "opensearch", "2.x", "os-template-2.12.0.yml")
Expand Down
8 changes: 4 additions & 4 deletions tests/tests_manifests_workflow/test_input_manifests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ def test_create_manifest_opensearch_default_template(self) -> None:
self.assertEqual(
input_manifest[0].to_dict(),
{
"schema-version": "1.1",
"schema-version": "1.2",
"build": {"name": "OpenSearch", "version": "0.2.3"},
"ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1",
"args": "-e JAVA_HOME=/opt/java/openjdk-21"}},
"ci": {"image": {"linux": {"tar": {"name": "opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1",
"args": "-e JAVA_HOME=/opt/java/openjdk-24"}}}},
"components": [{"name": "OpenSearch",
"repository": "https://github.com/opensearch-project/OpenSearch.git",
"ref": "0.x",
Expand All @@ -94,7 +94,7 @@ def test_create_manifest_opensearch_default_template(self) -> None:
'schema-version': '1.0',
'name': 'OpenSearch',
'ci': {'image': {'name': 'opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1',
'args': '-e JAVA_HOME=/opt/java/openjdk-21'}},
'args': '-e JAVA_HOME=/opt/java/openjdk-24'}},
'components': [{'name': 'index-management',
'integ-test': {'build-dependencies': ['job-scheduler'],
'test-configs': ['with-security', 'without-security'],
Expand Down