Refactor test.py and test_workflow package to use common packages (op…

…ensearch-project#186)

Move git_repository from build_workflow into a new "git" package and update build.py and test.py to use the new location.

Remove the duplicate GitRepository from test_workflow.

Change test.py to use the manifests and git packages. Move bundle_manifest to the manifests package.

Rename integ_test.py to integ_test_suite.py.

Signed-off-by: Cameron Skinner <camerski@amazon.com>

bundle-workflow/python/build.py

@@ -11,8 +11,8 @@
 from manifests.input_manifest import InputManifest
 from build_workflow.build_recorder import BuildRecorder
 from build_workflow.builder import Builder
-from build_workflow.git_repository import GitRepository
 from paths.script_finder import ScriptFinder
+from git.git_repository import GitRepository
 
 parser = argparse.ArgumentParser(description = "Build an OpenSearch Bundle")
 parser.add_argument('manifest', type = argparse.FileType('r'), help="Manifest file.")

bundle-workflow/python/test.py

@@ -4,9 +4,9 @@
 import tempfile
 import argparse
 from manifests.bundle_manifest import BundleManifest
+from git.git_repository import GitRepository
 from test_workflow.test_cluster import LocalTestCluster
-from test_workflow.git import GitRepository
-from test_workflow.integ_test import IntegTestSuite
+from test_workflow.integ_test_suite import IntegTestSuite
 
 parser = argparse.ArgumentParser(description = "Test an OpenSearch Bundle")
 parser.add_argument('manifest', type = argparse.FileType('r'), help="Manifest file.")
@@ -21,10 +21,10 @@
     cluster = LocalTestCluster(manifest.bundle_location)
 
     # For each component, check out the git repo and run `integtest.sh`
-    for component in manifest.components():
-        print(component.name())
-        repo = GitRepository(component.repository_url(), component.commit_id())
-        test_suite = IntegTestSuite(component.name(), repo)
+    for component in manifest.components:
+        print(component.name)
+        repo = GitRepository(component.repository_url, component.commit_id)
+        test_suite = IntegTestSuite(component.name, repo)
         test_suite.execute(cluster)
 
     cluster.destroy()

bundle-workflow/python/test_workflow/integ_test_suite.py

@@ -0,0 +1,14 @@
+import os
+
+class IntegTestSuite:
+    def __init__(self, name, repo):
+        self.name = name
+        self.repo = repo
+
+    def execute(self, cluster):
+        script = self.repo.dir.name + "/integtest.sh"
+        if (os.path.exists(script)):
+            print(f'sh integtest.sh -b {cluster.endpoint()} -p {cluster.port()}')
+#            repo.execute(f'sh integtest.sh -b {cluster.endpoint()} -p {cluster.port()}')
+        else:
+            print(f'{script} does not exist. Skipping integ tests for {self.name}')