Skip to content

Commit 6f52e99

Browse files
committed
remove OpenSearch build.sh: moved to OpenSearch repo
`build.sh` has been copied over to all active branches(*) of the OpenSearch repo and can now consequently be deleted here. this means, that from now on, the scripts from the respository will be picked up. for more information on the order of evaluation of the custom build scripts, see the [documentation][]. this gives the advantage to have branch-specific new logic in place there. this has already been used to add the no-jdk targets to the builds on main and 2.x. two tests were based on the assumption that there would be a `build.sh` for OpenSearch in this repository, however these are generic tests and just used OpenSearch as an example. they have been switched to be based on OpenSearch-Dashboards instead which - for the time being - still has its own `build.sh` here. (*): the following branches have been considered as active: - main - 2.x - 2.3 - 1.x - 1.3 this is part of opensearch-project#99 [documentation]: https://github.com/opensearch-project/opensearch-build/tree/main/src/build_workflow#custom-build-scripts Signed-off-by: Ralph Ursprung <Ralph.Ursprung@avaloq.com>
1 parent 9a48acc commit 6f52e99

File tree

2 files changed

+4
-165
lines changed

2 files changed

+4
-165
lines changed

scripts/components/OpenSearch/build.sh

-161
This file was deleted.

tests/tests_paths/test_script_finder.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ def test_find_build_script_opensearch_dashboards_default(self) -> None:
3939

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

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

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

0 commit comments

Comments
 (0)