diff --git a/tests/data/opensearch-build-1.1.0.yml b/tests/data/opensearch-build-1.1.0.yml index eaf25f9a81..b9fe5465f3 100644 --- a/tests/data/opensearch-build-1.1.0.yml +++ b/tests/data/opensearch-build-1.1.0.yml @@ -2,6 +2,7 @@ build: platform: linux architecture: x64 + distribution: None id: c3ff7a232d25403fa8cc14c97799c323 name: OpenSearch version: 1.1.0 diff --git a/tests/data/opensearch-dashboards-build-1.2.0.yml b/tests/data/opensearch-dashboards-build-1.2.0.yml index 2cbaf2461e..9bb35d4592 100644 --- a/tests/data/opensearch-dashboards-build-1.2.0.yml +++ b/tests/data/opensearch-dashboards-build-1.2.0.yml @@ -1,6 +1,7 @@ --- build: architecture: x64 + distribution: None id: 25b38c278cdd45efa583765d8ba76346 name: OpenSearch Dashboards platform: linux diff --git a/tests/tests_assemble_workflow/data/opensearch-build-linux-1.1.0.yml b/tests/tests_assemble_workflow/data/opensearch-build-linux-1.1.0.yml index eaf25f9a81..b9fe5465f3 100644 --- a/tests/tests_assemble_workflow/data/opensearch-build-linux-1.1.0.yml +++ b/tests/tests_assemble_workflow/data/opensearch-build-linux-1.1.0.yml @@ -2,6 +2,7 @@ build: platform: linux architecture: x64 + distribution: None id: c3ff7a232d25403fa8cc14c97799c323 name: OpenSearch version: 1.1.0 diff --git a/tests/tests_assemble_workflow/data/opensearch-build-linux-1.1.1.yml b/tests/tests_assemble_workflow/data/opensearch-build-linux-1.1.1.yml index 93ce620d6b..0e05c2c990 100644 --- a/tests/tests_assemble_workflow/data/opensearch-build-linux-1.1.1.yml +++ b/tests/tests_assemble_workflow/data/opensearch-build-linux-1.1.1.yml @@ -1,6 +1,7 @@ --- build: architecture: x64 + distribution: None id: f49ffcf2c1b341d1b29e147093689c6d name: OpenSearch platform: linux diff --git a/tests/tests_assemble_workflow/data/opensearch-build-windows-1.1.0.yml b/tests/tests_assemble_workflow/data/opensearch-build-windows-1.1.0.yml index 41a130da36..64b8285e34 100644 --- a/tests/tests_assemble_workflow/data/opensearch-build-windows-1.1.0.yml +++ b/tests/tests_assemble_workflow/data/opensearch-build-windows-1.1.0.yml @@ -1,6 +1,7 @@ --- build: platform: windows + distribution: None architecture: x64 id: c3ff7a232d25403fa8cc14c97799c323 name: OpenSearch diff --git a/tests/tests_assemble_workflow/data/opensearch-dashboards-build-1.1.0.yml b/tests/tests_assemble_workflow/data/opensearch-dashboards-build-1.1.0.yml index ccc51fc6ef..0d59e28cd6 100644 --- a/tests/tests_assemble_workflow/data/opensearch-dashboards-build-1.1.0.yml +++ b/tests/tests_assemble_workflow/data/opensearch-dashboards-build-1.1.0.yml @@ -2,6 +2,7 @@ build: platform: linux architecture: x64 + distribution: None id: c94ebec444a94ada86a230c9297b1d73 name: OpenSearch Dashboards version: 1.1.0 diff --git a/tests/tests_assemble_workflow/test_bundles.py b/tests/tests_assemble_workflow/test_bundles.py index 4f8ee58bff..52ac60a682 100644 --- a/tests/tests_assemble_workflow/test_bundles.py +++ b/tests/tests_assemble_workflow/test_bundles.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: Apache-2.0 +# SPDX-License-Identifier: Apache-1.0 # # The OpenSearch Contributors require contributions made to # this file be licensed under the Apache-2.0 license or a @@ -42,6 +42,7 @@ def test_bundle_opensearch_invalid(self) -> None: "name": "invalid", "platform": "linux", "architecture": "x86", + "distribution": "None", "id": "id", "version": "1.0.0", }, diff --git a/tests/tests_build_workflow/data/opensearch-build-windows-1.1.0.yml b/tests/tests_build_workflow/data/opensearch-build-windows-1.1.0.yml index 41a130da36..64b8285e34 100644 --- a/tests/tests_build_workflow/data/opensearch-build-windows-1.1.0.yml +++ b/tests/tests_build_workflow/data/opensearch-build-windows-1.1.0.yml @@ -1,6 +1,7 @@ --- build: platform: windows + distribution: None architecture: x64 id: c3ff7a232d25403fa8cc14c97799c323 name: OpenSearch diff --git a/tests/tests_build_workflow/test_build_recorder.py b/tests/tests_build_workflow/test_build_recorder.py index 3d6ad6a7ea..dc599675af 100644 --- a/tests/tests_build_workflow/test_build_recorder.py +++ b/tests/tests_build_workflow/test_build_recorder.py @@ -56,6 +56,7 @@ def test_record_component_and_artifact(self, mock_makedirs: Mock, mock_copyfile: "build": { "platform": "linux", "architecture": "x64", + "distribution": "None", "id": "1", "name": "OpenSearch", "version": "1.1.0", @@ -134,6 +135,7 @@ def test_get_manifest(self) -> None: "build": { "platform": "linux", "architecture": "x64", + "distribution": "None", "id": "1", "name": "OpenSearch", "version": "1.1.0", diff --git a/tests/tests_manifests/data/build/opensearch-build-schema-version-1.2.yml b/tests/tests_manifests/data/build/opensearch-build-schema-version-1.2.yml index fe14999355..c0d5486753 100644 --- a/tests/tests_manifests/data/build/opensearch-build-schema-version-1.2.yml +++ b/tests/tests_manifests/data/build/opensearch-build-schema-version-1.2.yml @@ -2,6 +2,7 @@ build: platform: linux architecture: x64 + distribution: None id: c3ff7a232d25403fa8cc14c97799c323 name: OpenSearch version: 1.1.0 diff --git a/tests/tests_manifests/data/opensearch-build-1.1.0.yml b/tests/tests_manifests/data/opensearch-build-1.1.0.yml index eaf25f9a81..b9fe5465f3 100644 --- a/tests/tests_manifests/data/opensearch-build-1.1.0.yml +++ b/tests/tests_manifests/data/opensearch-build-1.1.0.yml @@ -2,6 +2,7 @@ build: platform: linux architecture: x64 + distribution: None id: c3ff7a232d25403fa8cc14c97799c323 name: OpenSearch version: 1.1.0 diff --git a/tests/tests_manifests/data/opensearch-build-1.2.0.yml b/tests/tests_manifests/data/opensearch-build-1.2.0.yml index e8978b85ad..0bfbfe986c 100644 --- a/tests/tests_manifests/data/opensearch-build-1.2.0.yml +++ b/tests/tests_manifests/data/opensearch-build-1.2.0.yml @@ -2,6 +2,7 @@ build: platform: linux architecture: x64 + distribution: None id: c3ff7a232d25403fa8cc14c97799c323 name: OpenSearch version: 1.2.0 diff --git a/tests/tests_sign_workflow/data/opensearch-build-1.1.0.yml b/tests/tests_sign_workflow/data/opensearch-build-1.1.0.yml index be06b06b94..4d1e1d93dc 100644 --- a/tests/tests_sign_workflow/data/opensearch-build-1.1.0.yml +++ b/tests/tests_sign_workflow/data/opensearch-build-1.1.0.yml @@ -2,6 +2,7 @@ build: platform: linux architecture: x64 + distribution: None id: c3ff7a232d25403fa8cc14c97799c323 name: OpenSearch version: 1.1.0 diff --git a/tests/tests_test_workflow/data/local/builds/opensearch/manifest.yml b/tests/tests_test_workflow/data/local/builds/opensearch/manifest.yml index 6508a80568..73c2897641 100644 --- a/tests/tests_test_workflow/data/local/builds/opensearch/manifest.yml +++ b/tests/tests_test_workflow/data/local/builds/opensearch/manifest.yml @@ -1,6 +1,7 @@ --- build: architecture: x64 + distribution: None id: a8f93473cab545bbaac3e2ce599b5434 name: OpenSearch platform: linux diff --git a/tests/tests_test_workflow/data/remote/builds/opensearch/manifest.yml b/tests/tests_test_workflow/data/remote/builds/opensearch/manifest.yml index 6508a80568..73c2897641 100644 --- a/tests/tests_test_workflow/data/remote/builds/opensearch/manifest.yml +++ b/tests/tests_test_workflow/data/remote/builds/opensearch/manifest.yml @@ -1,6 +1,7 @@ --- build: architecture: x64 + distribution: None id: a8f93473cab545bbaac3e2ce599b5434 name: OpenSearch platform: linux diff --git a/tests/tests_test_workflow/test_bwc_workflow/bwc_test/data/build_manifest.yml b/tests/tests_test_workflow/test_bwc_workflow/bwc_test/data/build_manifest.yml index eaf25f9a81..c021b97740 100644 --- a/tests/tests_test_workflow/test_bwc_workflow/bwc_test/data/build_manifest.yml +++ b/tests/tests_test_workflow/test_bwc_workflow/bwc_test/data/build_manifest.yml @@ -1,6 +1,7 @@ --- build: platform: linux + distribution: None architecture: x64 id: c3ff7a232d25403fa8cc14c97799c323 name: OpenSearch diff --git a/tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest.yml b/tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest.yml index eaf25f9a81..c021b97740 100644 --- a/tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest.yml +++ b/tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest.yml @@ -1,6 +1,7 @@ --- build: platform: linux + distribution: None architecture: x64 id: c3ff7a232d25403fa8cc14c97799c323 name: OpenSearch diff --git a/tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest_missing_components.yml b/tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest_missing_components.yml index 8067daf0b4..b19697a463 100644 --- a/tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest_missing_components.yml +++ b/tests/tests_test_workflow/test_integ_workflow/integ_test/data/build_manifest_missing_components.yml @@ -2,6 +2,7 @@ build: platform: linux architecture: x64 + distribution: None id: c3ff7a232d25403fa8cc14c97799c323 name: OpenSearch version: 1.1.0