Skip to content

Commit

Permalink
Update the component_build_result field for Not Available scenari…
Browse files Browse the repository at this point in the history
…o. (opensearch-project#465)

Signed-off-by: Prudhvi Godithi <[email protected]>
  • Loading branch information
prudhvigodithi authored Jul 30, 2024
1 parent 0b44ea2 commit 3822ade
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jacocoTestReport {
}
}

String version = '6.7.1'
String version = '6.7.2'

task updateVersion {
doLast {
Expand Down
46 changes: 46 additions & 0 deletions tests/jenkins/TestPublishIntegTestResults.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion vars/publishIntegTestResults.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?: []
Expand Down

0 comments on commit 3822ade

Please sign in to comment.