From 1a1ceca887764a13144c2b0b58192b67b3fe7de4 Mon Sep 17 00:00:00 2001 From: Divya Madala Date: Wed, 27 Aug 2025 16:41:54 -0700 Subject: [PATCH 1/7] Add InternalClusterTests to coverage report Signed-off-by: Divya Madala --- gradle/code-coverage.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gradle/code-coverage.gradle b/gradle/code-coverage.gradle index fe7a68f0d3483..0ad39f2d247ee 100644 --- a/gradle/code-coverage.gradle +++ b/gradle/code-coverage.gradle @@ -71,6 +71,9 @@ if (System.getProperty("tests.coverage")) { testCodeCoverageReport(JacocoCoverageReport) { testSuiteName = "test" } + testCodeCoverageReportInternalClusterTest(JacocoCoverageReport) { + testSuiteName = "internalClusterTest" + } testCodeCoverageReportJavaRestTest(JacocoCoverageReport) { testSuiteName = "javaRestTest" } @@ -81,6 +84,7 @@ if (System.getProperty("tests.coverage")) { project.getTasks().named(JavaBasePlugin.CHECK_TASK_NAME).configure { dependsOn( tasks.named('testCodeCoverageReport', JacocoReport), + tasks.named('testCodeCoverageReportInternalClusterTest', JacocoReport), tasks.named('testCodeCoverageReportJavaRestTest', JacocoReport) ) } From 8c84c8e5ec83a256cb7b64dbb281041a16acc3e6 Mon Sep 17 00:00:00 2001 From: Divya Madala Date: Wed, 27 Aug 2025 18:06:00 -0700 Subject: [PATCH 2/7] no changes Signed-off-by: Divya Madala From 14119499ccd079e3872ca73b7e28e8338b4300c6 Mon Sep 17 00:00:00 2001 From: Divya Madala Date: Tue, 2 Sep 2025 10:43:37 -0700 Subject: [PATCH 3/7] no changes Signed-off-by: Divya Madala From e655d5836cea5f771a7139d1c53e82fcd4290c52 Mon Sep 17 00:00:00 2001 From: Divya Madala Date: Tue, 2 Sep 2025 12:25:48 -0700 Subject: [PATCH 4/7] no changes Signed-off-by: Divya Madala From c81a90772f5b1a40a44df6bd135aa1b6412a109d Mon Sep 17 00:00:00 2001 From: Divya Madala Date: Thu, 4 Sep 2025 10:05:15 -0700 Subject: [PATCH 5/7] Add coverage report for yamlresttest Signed-off-by: Divya Madala --- gradle/code-coverage.gradle | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gradle/code-coverage.gradle b/gradle/code-coverage.gradle index 0ad39f2d247ee..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() } } } @@ -77,6 +82,9 @@ if (System.getProperty("tests.coverage")) { testCodeCoverageReportJavaRestTest(JacocoCoverageReport) { testSuiteName = "javaRestTest" } + testCodeCoverageReportYamlRestTest(JacocoCoverageReport) { + testSuiteName = "yamlRestTest" + } } } @@ -85,7 +93,8 @@ if (System.getProperty("tests.coverage")) { dependsOn( tasks.named('testCodeCoverageReport', JacocoReport), tasks.named('testCodeCoverageReportInternalClusterTest', JacocoReport), - tasks.named('testCodeCoverageReportJavaRestTest', JacocoReport) + tasks.named('testCodeCoverageReportJavaRestTest', JacocoReport), + tasks.named('testCodeCoverageReportYamlRestTest', JacocoReport) ) } } From c0f2e56e313efeb20a1c2194676b7cf8c54f62c2 Mon Sep 17 00:00:00 2001 From: Divya Madala Date: Fri, 5 Sep 2025 13:13:34 -0700 Subject: [PATCH 6/7] Update change log Signed-off-by: Divya Madala --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12951aeeb75f7..c170f9ef52045 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Replace centos:8 with almalinux:8 since centos docker images are deprecated ([#19154](https://github.com/opensearch-project/OpenSearch/pull/19154)) - Add CompletionStage variants to IndicesAdminClient as an alternative to ActionListener ([#19161](https://github.com/opensearch-project/OpenSearch/pull/19161)) - Remove cap on Java version used by forbidden APIs ([#19163](https://github.com/opensearch-project/OpenSearch/pull/19163)) +- 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)) From 30819764c9d2b76d6a8b9d5732a62552a0315e3d Mon Sep 17 00:00:00 2001 From: Divya Madala Date: Fri, 5 Sep 2025 14:56:58 -0700 Subject: [PATCH 7/7] no changes Signed-off-by: Divya Madala