Update fix for the test_cluster to save all local cluster logs

Signed-off-by: Zelin Hao <zelinhao@amazon.com>
opensearch-project · Jul 27, 2023 · a885946 · a885946
2 parents c5c3fb1 + e5e214d
commit a885946
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/jenkins/check-for-build.jenkinsfile b/jenkins/check-for-build.jenkinsfile
@@ -14,6 +14,7 @@ pipeline {
     }
     triggers {
         parameterizedCron '''
+            H 1 * * * %INPUT_MANIFEST=2.9.1/opensearch-2.9.1.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
             H 1 * * * %INPUT_MANIFEST=2.10.0/opensearch-dashboards-2.10.0.yml;TARGET_JOB_NAME=distribution-build-opensearch-dashboards;BUILD_PLATFORM=linux windows;BUILD_DISTRIBUTION=tar rpm deb zip
             H 1 * * * %INPUT_MANIFEST=2.10.0/opensearch-2.10.0.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip
             H 1 * * * %INPUT_MANIFEST=1.3.12/opensearch-1.3.12.yml;TARGET_JOB_NAME=distribution-build-opensearch;BUILD_PLATFORM=linux macos windows;BUILD_DISTRIBUTION=tar rpm deb zip

diff --git a/manifests/2.9.1/opensearch-2.9.1.yml b/manifests/2.9.1/opensearch-2.9.1.yml
@@ -0,0 +1,16 @@
+---
+schema-version: '1.0'
+build:
+  name: OpenSearch
+  version: 2.9.1
+ci:
+  image:
+    name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v3
+    args: -e JAVA_HOME=/opt/java/openjdk-17
+components:
+  - name: OpenSearch
+    repository: https://github.com/opensearch-project/OpenSearch.git
+    ref: '2.9'
+    checks:
+      - gradle:publish
+      - gradle:properties:version
diff --git a/src/test_workflow/test_cluster.py b/src/test_workflow/test_cluster.py
@@ -83,6 +83,7 @@ def start(self) -> None:
     def terminate(self) -> None:
         if self.service:
             self.termination_result = self.service.terminate()
+            self.__save_test_result_data(self.termination_result)
 
         for service in self.dependencies:
             termination_result = service.terminate()
@@ -92,8 +93,6 @@ def terminate(self) -> None:
         if not self.termination_result:
             raise ClusterServiceNotInitializedException()
 
-        self.__save_test_result_data(self.termination_result)
-
         self.service.uninstall()
 
     def __save_test_result_data(self, termination_result: ServiceTerminationResult) -> None:

diff --git a/tests/tests_system/test_process.py b/tests/tests_system/test_process.py
@@ -67,7 +67,14 @@ def test_terminate_unstarted_process(self) -> None:
     def test_terminate_file_process(self, procs: MagicMock, subprocess: MagicMock, process: MagicMock) -> None:
         process_handler = Process()
 
+        mock_process1 = MagicMock()
+        mock_process2 = MagicMock()
+        procs.return_value = [mock_process1, mock_process2]
+
         process_handler.start("mock_command", "mock_cwd")
         process_handler.terminate()
 
-        procs.assert_called
+        procs.assert_called()
+
+        mock_process1.open_files.assert_called()
+        mock_process2.open_files.assert_called()