Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove OpenSearch build.sh: moved to OpenSearch repo #2835

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

remove OpenSearch build.sh: moved to OpenSearch repo #2835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
161 changes: 0 additions & 161 deletions scripts/components/OpenSearch/build.sh
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions tests/tests_build_workflow/test_builder_from_source.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def setUp(self) -> None:
)

self.builder_distribution = BuilderFromSource(
InputComponentFromSource({"name": "OpenSearch", "repository": "url", "ref": "ref"}),
InputComponentFromSource({"name": "OpenSearch-Dashboards", "repository": "url", "ref": "ref"}),
BuildTarget(
name="OpenSearch",
version="1.3.0",
Expand Down Expand Up @@ -99,7 +99,7 @@ def test_build_distribution(self, mock_git_repo: Mock) -> None:
" ".join(
[
"bash",
os.path.realpath(os.path.join(ScriptFinder.component_scripts_path, "OpenSearch", "build.sh")),
os.path.realpath(os.path.join(ScriptFinder.component_scripts_path, "OpenSearch-Dashboards", "build.sh")),
"-v 1.3.0",
"-p linux",
"-a x64",
Expand All @@ -109,7 +109,7 @@ def test_build_distribution(self, mock_git_repo: Mock) -> None:
]
)
)
build_recorder.record_component.assert_called_with("OpenSearch", mock_git_repo.return_value)
build_recorder.record_component.assert_called_with("OpenSearch-Dashboards", mock_git_repo.return_value)

@patch("build_workflow.builder_from_source.GitRepository")
def test_build_distribution_support(self, mock_git_repo: Mock) -> None:
Expand Down
8 changes: 4 additions & 4 deletions tests/tests_paths/test_script_finder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ def test_find_build_script_opensearch_dashboards_default(self) -> None:

def test_find_build_script_component_override(self) -> None:
self.assertEqual(
os.path.join(ScriptFinder.component_scripts_path, "OpenSearch", "build.sh"),
ScriptFinder.find_build_script("OpenSearch", "OpenSearch", self.component_without_scripts),
os.path.join(ScriptFinder.component_scripts_path, "OpenSearch-Dashboards", "build.sh"),
ScriptFinder.find_build_script("OpenSearch-Dashboards", "OpenSearch-Dashboards", self.component_without_scripts),
msg="A component without scripts resolves to a component override.",
)

Expand All @@ -60,8 +60,8 @@ def test_find_build_script_component_script_in_folder(self) -> None:

def test_find_build_script_component_script_in_folder_with_default(self) -> None:
self.assertEqual(
os.path.join(ScriptFinder.component_scripts_path, "OpenSearch", "build.sh"),
ScriptFinder.find_build_script("OpenSearch", "OpenSearch", self.component_with_scripts_folder),
os.path.join(ScriptFinder.component_scripts_path, "OpenSearch-Dashboards", "build.sh"),
ScriptFinder.find_build_script("OpenSearch-Dashboards", "OpenSearch-Dashboards", self.component_with_scripts_folder),
msg="A component with a scripts folder resolves to the override.",
)

Expand Down