Skip to content

Commit

Permalink
ScriptFinder logic temporary update to use correct integtest.sh until #…
Browse files Browse the repository at this point in the history
…497 is fixed in plugin repos

Signed-off-by: Himanshu Setia <setiah@amazon.com>
  • Loading branch information
Himanshu Setia committed Sep 15, 2021
1 parent 9032bdc commit 974e29a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 3 additions & 2 deletions bundle-workflow/src/paths/script_finder.py
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")),
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
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

0 comments on commit 974e29a

Please sign in to comment.