[Backport 6.x] Update the component_build_result field for `Not Ava…

…ilable` scenario. (#466) Signed-off-by: Prudhvi Godithi <[email protected]> Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-project · Jul 30, 2024 · 455e9ef · 455e9ef
1 parent 52ba7e1
commit 455e9ef
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 2 deletions.
diff --git a/build.gradle b/build.gradle
@@ -127,7 +127,7 @@ jacocoTestReport {
     }
 }
 
-String version = '6.7.1'
+String version = '6.7.2'
 
 task updateVersion {
     doLast {

diff --git a/tests/jenkins/TestPublishIntegTestResults.groovy b/tests/jenkins/TestPublishIntegTestResults.groovy
@@ -208,6 +208,52 @@ class TestPublishIntegTestResults extends BuildPipelineTest {
         assert parsedResult == expectedJson
     }
 
+    @Test
+    void testComponentResultWithSecurityFail() {
+        def withSecurity = 'fail'
+        def withoutSecurity = 'pass'
+        def componentResult = (withSecurity == 'fail' || withoutSecurity == 'fail' || withSecurity == 'Not Available' || withoutSecurity == 'Not Available') ? 'failed' : 'passed'
+
+        assert componentResult == 'failed'
+    }
+
+    @Test
+    void testComponentResultWithoutSecurityFail() {
+        def withSecurity = 'pass'
+        def withoutSecurity = 'fail'
+        def componentResult = (withSecurity == 'fail' || withoutSecurity == 'fail' || withSecurity == 'Not Available' || withoutSecurity == 'Not Available') ? 'failed' : 'passed'
+
+        assert componentResult == 'failed'
+    }
+
+    @Test
+    void testComponentResultWithSecurityNotAvailable() {
+        def withSecurity = 'Not Available'
+        def withoutSecurity = 'pass'
+        def componentResult = (withSecurity == 'fail' || withoutSecurity == 'fail' || withSecurity == 'Not Available' || withoutSecurity == 'Not Available') ? 'failed' : 'passed'
+
+        assert componentResult == 'failed'
+    }
+
+    @Test
+    void testComponentResultWithoutSecurityNotAvailable() {
+        def withSecurity = 'pass'
+        def withoutSecurity = 'Not Available'
+        def componentResult = (withSecurity == 'fail' || withoutSecurity == 'fail' || withSecurity == 'Not Available' || withoutSecurity == 'Not Available') ? 'failed' : 'passed'
+
+        assert componentResult == 'failed'
+    }
+
+    @Test
+    void testComponentResultBothPass() {
+        def withSecurity = 'pass'
+        def withoutSecurity = 'pass'
+        def componentResult = (withSecurity == 'fail' || withoutSecurity == 'fail' || withSecurity == 'Not Available' || withoutSecurity == 'Not Available') ? 'failed' : 'passed'
+
+        assert componentResult == 'passed'
+    }
+
+
     @Test
     void testCallWithMissingArgs() {
         def script = loadScript('vars/publishIntegTestResults.groovy')

diff --git a/vars/publishIntegTestResults.groovy b/vars/publishIntegTestResults.groovy
@@ -64,7 +64,7 @@ void call(Map args = [:]) {
         def componentCategory = manifest.name
         def withSecurity = component.configs.find { it.name == 'with-security' }?.status?.toLowerCase() ?: 'unknown'
         def withoutSecurity = component.configs.find { it.name == 'without-security' }?.status?.toLowerCase() ?: 'unknown'
-        def componentResult = (withSecurity == 'fail' || withoutSecurity == 'fail') ? 'failed' : 'passed'
+        def componentResult = (withSecurity == 'fail' || withoutSecurity == 'fail' || withSecurity == 'Not Available' || withoutSecurity == 'Not Available') ? 'failed' : 'passed'
         def withSecurityYml = component.configs.find { it.name == 'with-security' }?.yml ?: ''
         def withSecurityStdout = component.configs.find { it.name == 'with-security' }?.cluster_stdout ?: []
         def withSecurityStderr = component.configs.find { it.name == 'with-security' }?.cluster_stderr ?: []