ScriptFinder logic temporary update to use correct integtest.sh until opensearch-project#497 is fixed in plugin repos

Signed-off-by: Himanshu Setia <[email protected]>

Author: Himanshu Setia

bundle-workflow/src/paths/script_finder.py

@@ -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")
             ),

bundle-workflow/tests/tests_paths/test_script_finder.py

@@ -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"),
@@ -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"),