Create a new method for generating component yml after process killed

Signed-off-by: Zelin Hao <zelinhao@amazon.com>
zelinh · Feb 9, 2024 · b985877 · b985877
1 parent d7a8cab
commit b985877
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/src/test_workflow/integ_test/integ_test_runner.py b/src/test_workflow/integ_test/integ_test_runner.py
@@ -45,7 +45,7 @@ def run(self) -> TestSuiteResults:
                     if test_config.integ_test:
                         test_suite = self.__create_test_suite__(component, test_config, work_dir.path)
                         test_results = test_suite.execute_tests()
-                        # [self.test_recorder.test_results_logs.save_test_result_data(result_data) for result_data in test_suite.result_data]
+                        [self.test_recorder.test_results_logs.generate_component_yml(result_data) for result_data in test_suite.result_data]
                         all_results.append(component.name, test_results)
                     else:
                         logging.info(f"Skipping integ-tests for {component.name}, as it is currently not supported")

diff --git a/src/test_workflow/integ_test/integ_test_suite_opensearch.py b/src/test_workflow/integ_test/integ_test_suite_opensearch.py
@@ -130,6 +130,7 @@ def custom_node_endpoint_encoder(node_endpoint: NodeEndpoint) -> dict:
                 self.test_artifact_files
             )
             self.save_logs.save_test_result_data(test_result_data)
+            self.test_result_data.append(test_result_data)
             if stderr:
                 logging.info("Stderr reported for component: " + self.component.name)
                 logging.info(stderr)

diff --git a/src/test_workflow/integ_test/integ_test_suite_opensearch_dashboards.py b/src/test_workflow/integ_test/integ_test_suite_opensearch_dashboards.py
@@ -123,6 +123,7 @@ def custom_node_endpoint_encoder(node_endpoint: NodeEndpoint) -> dict:
                 self.test_artifact_files
             )
             self.save_logs.save_test_result_data(test_result_data)
+            self.test_result_data.append(test_result_data)
             if stderr:
                 logging.info("Stderr reported for component: " + self.component.name)
                 logging.info(stderr)

diff --git a/src/test_workflow/test_recorder/test_recorder.py b/src/test_workflow/test_recorder/test_recorder.py
@@ -144,7 +144,10 @@ def save_test_result_data(self, test_result_data: TestResultData) -> None:
         logging.info(f"Recording component test results for {test_result_data.component_name} at " f"{os.path.realpath(dest_directory)}")
         self.parent_class._generate_std_files(test_result_data.stdout, test_result_data.stderr, dest_directory)
         self.parent_class._copy_log_files(test_result_data.log_files, dest_directory)
-        self.parent_class._generate_yml(test_result_data, dest_directory)
 
 
+    def generate_component_yml(self, test_result_data: TestResultData):
+        dest_directory = self.parent_class._create_base_folder_structure(test_result_data.component_name, test_result_data.component_test_config)
+        self.parent_class._generate_yml(test_result_data, dest_directory)
+
 TestRecorder.__test__ = False  # type:ignore