From d459fa0afc0911e5681ed50523f377f21a335345 Mon Sep 17 00:00:00 2001 From: ankitkala Date: Tue, 28 Sep 2021 02:28:44 +0530 Subject: [PATCH] Add replication plugin to Opensearch 1.1 build manifest (#315) Signed-off-by: Sai Kumar --- bundle-workflow/tests/test_run_build.py | 8 ++++---- bundle-workflow/tests/test_run_checkout.py | 2 +- bundle-workflow/tests/test_run_ci.py | 4 ++-- .../tests/tests_manifests/test_input_manifest.py | 2 +- manifests/1.1.0/opensearch-1.1.0.yml | 4 +++- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/bundle-workflow/tests/test_run_build.py b/bundle-workflow/tests/test_run_build.py index 6d8dcffea2..40ace7661e 100644 --- a/bundle-workflow/tests/test_run_build.py +++ b/bundle-workflow/tests/test_run_build.py @@ -68,7 +68,7 @@ def test_main(self, mock_temp, mock_repo, mock_recorder, mock_builder, *mocks): any_order=True, ) - self.assertEqual(mock_repo.call_count, 14) + self.assertEqual(mock_repo.call_count, 15) # each component is built and its artifacts exported mock_builder.assert_has_calls( @@ -86,9 +86,9 @@ def test_main(self, mock_temp, mock_repo, mock_recorder, mock_builder, *mocks): any_order=True, ) - self.assertEqual(mock_builder.call_count, 14) - self.assertEqual(mock_builder.return_value.build.call_count, 14) - self.assertEqual(mock_builder.return_value.export_artifacts.call_count, 14) + self.assertEqual(mock_builder.call_count, 15) + self.assertEqual(mock_builder.return_value.build.call_count, 15) + self.assertEqual(mock_builder.return_value.export_artifacts.call_count, 15) # the output manifest is written mock_recorder.return_value.write_manifest.assert_called() diff --git a/bundle-workflow/tests/test_run_checkout.py b/bundle-workflow/tests/test_run_checkout.py index 6fa9a62328..1e16fbd662 100644 --- a/bundle-workflow/tests/test_run_checkout.py +++ b/bundle-workflow/tests/test_run_checkout.py @@ -68,4 +68,4 @@ def test_main(self, mock_temp, mock_repo): any_order=True, ) - self.assertEqual(mock_repo.call_count, 14) + self.assertEqual(mock_repo.call_count, 15) diff --git a/bundle-workflow/tests/test_run_ci.py b/bundle-workflow/tests/test_run_ci.py index 35f7f1720f..3497108986 100644 --- a/bundle-workflow/tests/test_run_ci.py +++ b/bundle-workflow/tests/test_run_ci.py @@ -61,5 +61,5 @@ def test_main(self, mock_temp, mock_repo, mock_ci, *mocks): ) # each component gets checked out and checked - self.assertEqual(mock_repo.call_count, 14) - self.assertEqual(mock_ci.return_value.check.call_count, 14) + self.assertEqual(mock_repo.call_count, 15) + self.assertEqual(mock_ci.return_value.check.call_count, 15) diff --git a/bundle-workflow/tests/tests_manifests/test_input_manifest.py b/bundle-workflow/tests/tests_manifests/test_input_manifest.py index 9dd545b565..cb4d4395e9 100644 --- a/bundle-workflow/tests/tests_manifests/test_input_manifest.py +++ b/bundle-workflow/tests/tests_manifests/test_input_manifest.py @@ -42,7 +42,7 @@ def test_1_1(self): self.assertEqual(manifest.version, "1.0") self.assertEqual(manifest.build.name, "OpenSearch") self.assertEqual(manifest.build.version, "1.1.0") - self.assertEqual(len(manifest.components), 14) + self.assertEqual(len(manifest.components), 15) # opensearch component opensearch_component = manifest.components[0] self.assertEqual(opensearch_component.name, "OpenSearch") diff --git a/manifests/1.1.0/opensearch-1.1.0.yml b/manifests/1.1.0/opensearch-1.1.0.yml index c75d1d6972..1c30f585ab 100644 --- a/manifests/1.1.0/opensearch-1.1.0.yml +++ b/manifests/1.1.0/opensearch-1.1.0.yml @@ -37,6 +37,9 @@ components: - name: security repository: https://github.com/opensearch-project/security.git ref: "1.1" + - name: cross-cluster-replication + repository: https://github.com/opensearch-project/cross-cluster-replication.git + ref: "1.1" - name: performance-analyzer-rca repository: https://github.com/opensearch-project/performance-analyzer-rca.git ref: "1.1" @@ -86,4 +89,3 @@ components: checks: - gradle:properties:version - gradle:dependencies:opensearch.version -