diff --git a/manifests/3.2.0/opensearch-3.2.0-test.yml b/manifests/3.2.0/opensearch-3.2.0-test.yml index 6d39087eb3..85abea57d0 100644 --- a/manifests/3.2.0/opensearch-3.2.0-test.yml +++ b/manifests/3.2.0/opensearch-3.2.0-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-21 + args: -e JAVA_HOME=/opt/java/openjdk-24 components: - name: OpenSearch integ-test: diff --git a/manifests/3.2.0/opensearch-3.2.0.yml b/manifests/3.2.0/opensearch-3.2.0.yml index c7b107f317..a4989b8613 100644 --- a/manifests/3.2.0/opensearch-3.2.0.yml +++ b/manifests/3.2.0/opensearch-3.2.0.yml @@ -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 diff --git a/manifests/templates/opensearch/3.x/manifest-test.yml b/manifests/templates/opensearch/3.x/manifest-test.yml index 5c481e2d98..4ad47296a8 100644 --- a/manifests/templates/opensearch/3.x/manifest-test.yml +++ b/manifests/templates/opensearch/3.x/manifest-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-21 + args: -e JAVA_HOME=/opt/java/openjdk-24 components: - name: index-management integ-test: diff --git a/manifests/templates/opensearch/3.x/manifest.yml b/manifests/templates/opensearch/3.x/manifest.yml index 89a99b1cf6..a4ab9d4520 100644 --- a/manifests/templates/opensearch/3.x/manifest.yml +++ b/manifests/templates/opensearch/3.x/manifest.yml @@ -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 diff --git a/manifests/templates/opensearch/default/manifest-test.yml b/manifests/templates/opensearch/default/manifest-test.yml index 5c481e2d98..4ad47296a8 100644 --- a/manifests/templates/opensearch/default/manifest-test.yml +++ b/manifests/templates/opensearch/default/manifest-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-21 + args: -e JAVA_HOME=/opt/java/openjdk-24 components: - name: index-management integ-test: diff --git a/manifests/templates/opensearch/default/manifest.yml b/manifests/templates/opensearch/default/manifest.yml index 852db1a3df..a4ab9d4520 100644 --- a/manifests/templates/opensearch/default/manifest.yml +++ b/manifests/templates/opensearch/default/manifest.yml @@ -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 diff --git a/tests/tests_manifests/test_input_manifest.py b/tests/tests_manifests/test_input_manifest.py index af0e3405e5..fb2d770985 100644 --- a/tests/tests_manifests/test_input_manifest.py +++ b/tests/tests_manifests/test_input_manifest.py @@ -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") diff --git a/tests/tests_manifests_workflow/test_input_manifests.py b/tests/tests_manifests_workflow/test_input_manifests.py index 75ed969516..073a02c8b3 100644 --- a/tests/tests_manifests_workflow/test_input_manifests.py +++ b/tests/tests_manifests_workflow/test_input_manifests.py @@ -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", @@ -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'],