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

ScriptFinder logic temporary update to use correct integtest.sh #499

Merged
merged 1 commit into from
Sep 16, 2021
Merged

ScriptFinder logic temporary update to use correct integtest.sh #499

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
5 changes: 3 additions & 2 deletions bundle-workflow/src/paths/script_finder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ def find_build_script(cls, component_name, git_dir):
@classmethod
def find_integ_test_script(cls, component_name, git_dir):
paths = [
os.path.realpath(os.path.join(git_dir, "integtest.sh")),
os.path.realpath(os.path.join(git_dir, "scripts/integtest.sh")),
# TODO: Uncomment this after the integtest.sh tool is removed from plugin repos. See issue #497
# os.path.realpath(os.path.join(git_dir, "integtest.sh")),
# os.path.realpath(os.path.join(git_dir, "scripts/integtest.sh")),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are there any repos doing this? If not I would uncomment it, this way repos can actually customize the integtest.sh script. And remove the option of having it at the root permanently.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, the 5 mentioned in issue #497 are doing this. The idea was to unblock integration testing, while we get these resolved in parallel, inside the mentioned plugin repos.

os.path.realpath(
os.path.join(cls.component_scripts_path, component_name, "integtest.sh")
),
Expand Down
2 changes: 2 additions & 0 deletions bundle-workflow/tests/tests_paths/test_script_finder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ def test_find_integ_test_script_component_override(self):
msg="A component without scripts resolves to a component override.",
)

@unittest.skip('See https://github.com/opensearch-project/opensearch-build/issues/497')
def test_find_integ_test_script_component_script(self):
self.assertEqual(
os.path.join(self.component_with_scripts, "integtest.sh"),
Expand All @@ -101,6 +102,7 @@ def test_find_integ_test_script_component_script(self):
msg="A component with a script resolves to the script at the root.",
)

@unittest.skip('See https://github.com/opensearch-project/opensearch-build/issues/497')
def test_find_integ_test_script_component_script_in_folder(self):
self.assertEqual(
os.path.join(self.component_with_scripts_folder, "scripts/integtest.sh"),
Expand Down