From 9b8d7809ba0f73de7d29a99fe5be8261be34fc06 Mon Sep 17 00:00:00 2001
From: Zelin Hao <zelinhao@amazon.com>
Date: Thu, 8 Feb 2024 10:43:50 -0800
Subject: [PATCH] Update the template manifest for manifest workflow

Signed-off-by: Zelin Hao <zelinhao@amazon.com>
---
 manifests/templates/opensearch-dashboards/2.x/manifest.yml  | 2 +-
 manifests/templates/opensearch-dashboards/3.x/manifest.yml  | 2 +-
 .../templates/opensearch-dashboards/default/manifest.yml    | 2 +-
 manifests/templates/opensearch/2.x/manifest.yml             | 2 +-
 manifests/templates/opensearch/3.x/manifest.yml             | 4 ++--
 manifests/templates/opensearch/default/manifest.yml         | 4 ++--
 tests/tests_manifests_workflow/test_input_manifests.py      | 6 +++---
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/manifests/templates/opensearch-dashboards/2.x/manifest.yml b/manifests/templates/opensearch-dashboards/2.x/manifest.yml
index 4ddc7f95c6..2622bd13b3 100644
--- a/manifests/templates/opensearch-dashboards/2.x/manifest.yml
+++ b/manifests/templates/opensearch-dashboards/2.x/manifest.yml
@@ -1,5 +1,5 @@
 ---
-schema-version: '1.0'
+schema-version: '1.1'
 build:
   name: OpenSearch Dashboards
   version: 'replace'
diff --git a/manifests/templates/opensearch-dashboards/3.x/manifest.yml b/manifests/templates/opensearch-dashboards/3.x/manifest.yml
index b6a45d6577..5e684ee32b 100644
--- a/manifests/templates/opensearch-dashboards/3.x/manifest.yml
+++ b/manifests/templates/opensearch-dashboards/3.x/manifest.yml
@@ -1,5 +1,5 @@
 ---
-schema-version: '1.0'
+schema-version: '1.1'
 build:
   name: OpenSearch Dashboards
   version: 'replace'
diff --git a/manifests/templates/opensearch-dashboards/default/manifest.yml b/manifests/templates/opensearch-dashboards/default/manifest.yml
index 4ddc7f95c6..2622bd13b3 100644
--- a/manifests/templates/opensearch-dashboards/default/manifest.yml
+++ b/manifests/templates/opensearch-dashboards/default/manifest.yml
@@ -1,5 +1,5 @@
 ---
-schema-version: '1.0'
+schema-version: '1.1'
 build:
   name: OpenSearch Dashboards
   version: 'replace'
diff --git a/manifests/templates/opensearch/2.x/manifest.yml b/manifests/templates/opensearch/2.x/manifest.yml
index f78093313f..ce51bbae19 100644
--- a/manifests/templates/opensearch/2.x/manifest.yml
+++ b/manifests/templates/opensearch/2.x/manifest.yml
@@ -6,7 +6,7 @@ build:
 ci:
   image:
     name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3
-    args: -e JAVA_HOME=/opt/java/openjdk-17
+    args: -e JAVA_HOME=/opt/java/openjdk-21
 components:
   - name: OpenSearch
     repository: https://github.com/opensearch-project/OpenSearch.git
diff --git a/manifests/templates/opensearch/3.x/manifest.yml b/manifests/templates/opensearch/3.x/manifest.yml
index 2db16e6b43..ce51bbae19 100644
--- a/manifests/templates/opensearch/3.x/manifest.yml
+++ b/manifests/templates/opensearch/3.x/manifest.yml
@@ -1,12 +1,12 @@
 ---
-schema-version: '1.0'
+schema-version: '1.1'
 build:
   name: OpenSearch
   version: 'replace'
 ci:
   image:
     name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3
-    args: -e JAVA_HOME=/opt/java/openjdk-17
+    args: -e JAVA_HOME=/opt/java/openjdk-21
 components:
   - name: OpenSearch
     repository: https://github.com/opensearch-project/OpenSearch.git
diff --git a/manifests/templates/opensearch/default/manifest.yml b/manifests/templates/opensearch/default/manifest.yml
index 2db16e6b43..ce51bbae19 100644
--- a/manifests/templates/opensearch/default/manifest.yml
+++ b/manifests/templates/opensearch/default/manifest.yml
@@ -1,12 +1,12 @@
 ---
-schema-version: '1.0'
+schema-version: '1.1'
 build:
   name: OpenSearch
   version: 'replace'
 ci:
   image:
     name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3
-    args: -e JAVA_HOME=/opt/java/openjdk-17
+    args: -e JAVA_HOME=/opt/java/openjdk-21
 components:
   - name: OpenSearch
     repository: https://github.com/opensearch-project/OpenSearch.git
diff --git a/tests/tests_manifests_workflow/test_input_manifests.py b/tests/tests_manifests_workflow/test_input_manifests.py
index 6d55ebc2c6..e6116afc4a 100644
--- a/tests/tests_manifests_workflow/test_input_manifests.py
+++ b/tests/tests_manifests_workflow/test_input_manifests.py
@@ -58,10 +58,10 @@ def test_create_manifest_opensearch_from_default(self) -> None:
         self.assertEqual(
             input_manifest.to_dict(),
             {
-                "schema-version": "1.0",
+                "schema-version": "1.1",
                 "build": {"name": "OpenSearch", "version": "0.2.3"},
                 "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3",
-                                 "args": "-e JAVA_HOME=/opt/java/openjdk-17"}},
+                                 "args": "-e JAVA_HOME=/opt/java/openjdk-21"}},
             },
         )
 
@@ -83,7 +83,7 @@ def test_create_manifest_opensearch_dashboards_from_default(self) -> None:
         self.assertEqual(
             input_manifest.to_dict(),
             {
-                "schema-version": "1.0",
+                "schema-version": "1.1",
                 "build": {"name": "OpenSearch Dashboards", "version": "4.2.3"},
                 "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-build-v1", }},
             },