diff --git a/tests/tests_manifests_workflow/data/opensearch-2.12.1000-test.yml b/tests/tests_manifests_workflow/data/opensearch-2.12.1000-test.yml new file mode 100644 index 0000000000..f9ffe22604 --- /dev/null +++ b/tests/tests_manifests_workflow/data/opensearch-2.12.1000-test.yml @@ -0,0 +1,160 @@ +--- +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 +components: + - name: alerting + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + plugins.destination.host.deny_list: [10.0.0.0/8, 127.0.0.1] + bwc-test: + test-configs: + - with-security + + - name: anomaly-detection + integ-test: + build-dependencies: + - job-scheduler + test-configs: + - with-security + - without-security + bwc-test: + test-configs: + - with-security + + - name: flow-framework + integ-test: + test-configs: + - with-security + - without-security + + - name: asynchronous-search + integ-test: + test-configs: + - with-security + - without-security + bwc-test: + test-configs: + - with-security + + - name: cross-cluster-replication + integ-test: + topology: + - cluster_name: leader + data_nodes: 2 + cluster_manager_nodes: 0 + - cluster_name: follower + data_nodes: 2 + cluster_manager_nodes: 0 + test-configs: + - with-security + - without-security + + - name: geospatial + integ-test: + test-configs: + - with-security + - without-security + + - name: index-management + integ-test: + build-dependencies: + - job-scheduler + test-configs: + - with-security + - without-security + additional-cluster-configs: + path.repo: [/tmp] + bwc-test: + test-configs: + - with-security + + - name: k-NN + integ-test: + test-configs: + - with-security + - without-security + + - name: ml-commons + integ-test: + test-configs: + - with-security + - without-security + + - name: neural-search + integ-test: + test-configs: + - with-security + - without-security + + - name: notifications + working-directory: notifications + integ-test: + test-configs: + - with-security + - without-security + bwc-test: + test-configs: + - with-security + + - name: opensearch-observability + integ-test: + test-configs: + - with-security + - without-security + bwc-test: + test-configs: + - with-security + + - name: opensearch-reports + integ-test: + test-configs: + - with-security + - without-security + + - name: security + integ-test: + test-configs: + - with-security + + - name: security-analytics + integ-test: + test-configs: + - with-security + - without-security + + - name: sql + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + script.context.field.max_compilations_rate: 1000/1m + plugins.query.datasources.encryption.masterkey: 4fc8fee6a3fd7d6ca01772e5 + bwc-test: + test-configs: + - with-security + + - name: custom-codecs + integ-test: + test-configs: + - with-security + - without-security + + - name: skills + integ-test: + test-configs: + - with-security + - without-security + + - name: query-insights + integ-test: + test-configs: + - with-security + - without-security diff --git a/tests/tests_manifests_workflow/data/opensearch-dashboards-2.12.1000-test.yml b/tests/tests_manifests_workflow/data/opensearch-dashboards-2.12.1000-test.yml new file mode 100644 index 0000000000..d1a4216bd2 --- /dev/null +++ b/tests/tests_manifests_workflow/data/opensearch-dashboards-2.12.1000-test.yml @@ -0,0 +1,95 @@ +--- +schema-version: '1.0' +name: OpenSearch Dashboards +ci: + image: + name: opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v4 +components: + - name: OpenSearch-Dashboards + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + vis_builder.enabled: true + data_source.enabled: true + savedObjects.maxImportPayloadBytes: 10485760 + server.maxPayloadBytes: 1759977 + logging.json: false + data.search.aggs.shardDelay.enabled: true + csp.warnLegacyBrowsers: false + ci-groups: 9 + - name: alertingDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: anomalyDetectionDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: ganttChartDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: indexManagementDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: observabilityDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: queryWorkbenchDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: reportsDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: securityDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: notificationsDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: customImportMapDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: searchRelevanceDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: securityAnalyticsDashboards + integ-test: + test-configs: + - with-security + - without-security + - name: mlCommonsDashboards + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + ml_commons_dashboards.enabled: true + - name: assistantDashboards + integ-test: + test-configs: + - with-security + - without-security + additional-cluster-configs: + assistant.chat.enabled: true diff --git a/tests/tests_manifests_workflow/test_input_manifests.py b/tests/tests_manifests_workflow/test_input_manifests.py index 18c9a50abe..445b64f741 100644 --- a/tests/tests_manifests_workflow/test_input_manifests.py +++ b/tests/tests_manifests_workflow/test_input_manifests.py @@ -15,6 +15,7 @@ class TestInputManifests(unittest.TestCase): + maxDiff = None def test_manifests_path(self) -> None: path = os.path.realpath(os.path.join(os.path.dirname(__file__), "..", "..", "manifests")) self.assertEqual(path, InputManifests.manifests_path()) @@ -45,7 +46,7 @@ def test_create_manifest_opensearch_template(self) -> None: input_manifests = InputManifests("OpenSearch") input_manifest = input_manifests.create_manifest("1.2.3", "1.x", []) self.assertEqual( - input_manifest.to_dict(), + input_manifest[0].to_dict(), { "schema-version": "1.0", "build": {"name": "OpenSearch", "version": "1.2.3"}, @@ -62,11 +63,11 @@ def test_create_manifest_opensearch_default_template(self) -> None: input_manifests = InputManifests("OpenSearch") input_manifest = input_manifests.create_manifest("0.2.3", "0.x", []) self.assertEqual( - input_manifest.to_dict(), + input_manifest[0].to_dict(), { "schema-version": "1.1", "build": {"name": "OpenSearch", "version": "0.2.3"}, - "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3", + "ci": {"image": {"name": "opensearchstaging/ci-runner:ci-runner-al2-opensearch-build-v1", "args": "-e JAVA_HOME=/opt/java/openjdk-21"}}, "components": [{"name": "OpenSearch", "repository": "https://github.com/opensearch-project/OpenSearch.git", @@ -80,13 +81,13 @@ def test_create_manifest_opensearch_previous_base_version(self) -> None: input_manifest = input_manifests.create_manifest("2.12.1000", "2.12", ["0.9.2", "1.3.1", "1.3.14", "2.12.0", "2.14.0", "3.0.0"]) # based on 2.12.0 manifest_path = os.path.join(os.path.dirname(__file__), "data", "opensearch-2.12.1000.yml") input_manifest_compare = InputManifest.from_file(open(manifest_path)) - self.assertEqual(input_manifest.to_dict(), input_manifest_compare.to_dict()) + self.assertEqual(input_manifest[0].to_dict(), input_manifest_compare.to_dict()) def test_create_manifest_opensearch_dashboards_template(self) -> None: input_manifests = InputManifests("OpenSearch Dashboards") input_manifest = input_manifests.create_manifest("1.2.3", "1.x", []) self.assertEqual( - input_manifest.to_dict(), + input_manifest[0].to_dict(), { "schema-version": "1.0", "build": {"name": "OpenSearch Dashboards", "version": "1.2.3"}, @@ -101,7 +102,7 @@ def test_create_manifest_opensearch_dashboards_default_template(self) -> None: input_manifests = InputManifests("OpenSearch Dashboards") input_manifest = input_manifests.create_manifest("4.2.3", "4.x", []) self.assertEqual( - input_manifest.to_dict(), + input_manifest[0].to_dict(), { "schema-version": "1.1", "build": {"name": "OpenSearch Dashboards", "version": "4.2.3"}, @@ -118,7 +119,7 @@ def test_create_manifest_opensearch_dashboards_previous_base_version(self) -> No input_manifest = input_manifests.create_manifest("2.12.1000", "2.12", ["0.9.2", "1.3.1", "1.3.14", "2.12.0", "2.14.0", "3.0.0"]) # based on 2.12.0 manifest_path = os.path.join(os.path.dirname(__file__), "data", "opensearch-dashboards-2.12.1000.yml") input_manifest_compare = InputManifest.from_file(open(manifest_path)) - self.assertEqual(input_manifest.to_dict(), input_manifest_compare.to_dict()) + self.assertEqual(input_manifest[0].to_dict(), input_manifest_compare.to_dict()) @patch("manifests.manifest.Manifest.to_file") @patch("os.makedirs")