diff --git a/CHANGELOG.md b/CHANGELOG.md index cefcd81a291fd..9b03ddfe9ea1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Remove cap on Java version used by forbidden APIs ([#19163](https://github.com/opensearch-project/OpenSearch/pull/19163)) - Disable pruning for `doc_values` for the wildcard field mapper ([#18568](https://github.com/opensearch-project/OpenSearch/pull/18568)) - Make all methods in Engine.Result public ([#19276](https://github.com/opensearch-project/OpenSearch/pull/19275)) +- Create and attach interclusterTest and yamlRestTest code coverage reports to gradle check task([#19165](https://github.com/opensearch-project/OpenSearch/pull/19165)) ### Fixed - Fix unnecessary refreshes on update preparation failures ([#15261](https://github.com/opensearch-project/OpenSearch/issues/15261)) diff --git a/gradle/code-coverage.gradle b/gradle/code-coverage.gradle index fe7a68f0d3483..11a8a1253e1d1 100644 --- a/gradle/code-coverage.gradle +++ b/gradle/code-coverage.gradle @@ -52,6 +52,10 @@ allprojects { executionDataFiles.add("$buildDir/jacoco/javaRestTest.exec") sourceSetsList.add(sourceSets.javaRestTest) } + if (tasks.findByName('yamlRestTest')) { + executionDataFiles.add("$buildDir/jacoco/yamlRestTest.exec") + sourceSetsList.add(sourceSets.yamlRestTest) + } if (!executionDataFiles.isEmpty()) { executionData.setFrom(files(executionDataFiles).filter { it.exists() }) sourceSets(*sourceSetsList) @@ -59,7 +63,8 @@ allprojects { onlyIf { file("$buildDir/jacoco/test.exec").exists() || file("$buildDir/jacoco/internalClusterTest.exec").exists() || - file("$buildDir/jacoco/javaRestTest.exec").exists() + file("$buildDir/jacoco/javaRestTest.exec").exists() || + file("$buildDir/jacoco/yamlRestTest.exec").exists() } } } @@ -71,9 +76,15 @@ if (System.getProperty("tests.coverage")) { testCodeCoverageReport(JacocoCoverageReport) { testSuiteName = "test" } + testCodeCoverageReportInternalClusterTest(JacocoCoverageReport) { + testSuiteName = "internalClusterTest" + } testCodeCoverageReportJavaRestTest(JacocoCoverageReport) { testSuiteName = "javaRestTest" } + testCodeCoverageReportYamlRestTest(JacocoCoverageReport) { + testSuiteName = "yamlRestTest" + } } } @@ -81,7 +92,9 @@ if (System.getProperty("tests.coverage")) { project.getTasks().named(JavaBasePlugin.CHECK_TASK_NAME).configure { dependsOn( tasks.named('testCodeCoverageReport', JacocoReport), - tasks.named('testCodeCoverageReportJavaRestTest', JacocoReport) + tasks.named('testCodeCoverageReportInternalClusterTest', JacocoReport), + tasks.named('testCodeCoverageReportJavaRestTest', JacocoReport), + tasks.named('testCodeCoverageReportYamlRestTest', JacocoReport) ) } }