refactor

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

Author: bowenlan-amzn

.github/workflows/test-and-build-workflow.yml

@@ -55,7 +55,19 @@ jobs:
         timeout-minutes: 20
         run: |
           chown -R 1000:1000 `pwd`
-          su `id -un 1000` -c "./gradlew build ${{ env.TEST_FILTER }} || (exit_code=$?; ./gradlew jacocoTestReport; exit $exit_code)"
+          su `id -un 1000` -c "./gradlew build ${{ env.TEST_FILTER }}"
+      - name: Generate Jacoco Test Report
+        if: always()
+        run: |
+          su `id -un 1000` -c "./gradlew jacocoTestReport -Dtests.coverage=true"
+      - name: Upload coverage XML
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: coverage-xml-${{ matrix.java }}-${{ matrix.feature }}
+          path: build/reports/jacoco/**/jacocoTestReport.xml
+          if-no-files-found: warn
+          overwrite: 'true'
       - name: Upload failed logs
         uses: actions/upload-artifact@v4
         if: ${{ failure() }}
@@ -70,14 +82,6 @@ jobs:
           name: test-reports-linux-${{ matrix.java }}-${{ matrix.feature }}
           path: build/reports/
           overwrite: 'true'
-      - name: Upload coverage XML
-        uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: coverage-xml-${{ matrix.java }}-${{ matrix.feature }}
-          path: build/reports/jacoco/**/jacocoTestReport.xml
-          if-no-files-found: warn
-          overwrite: 'true'
       - name: Create Artifact Path
         run: |
           mkdir -p index-management-artifacts
@@ -153,7 +157,6 @@ jobs:
     if: always()
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4
         with:
           path: downloaded-artifacts

build-tools/coverage.gradle

@@ -19,7 +19,7 @@
 
 // Get gradle to generate the required jvm agent arg for us using a dummy tasks of type Test. Unfortunately Elastic's
 // testing tasks don't derive from Test so the jacoco plugin can't do this automatically.
-def jacocoDir = "${getLayout().getBuildDirectory()}/jacoco"
+def jacocoDir = layout.buildDirectory.dir("jacoco").get().asFile.absolutePath
 
 tasks.register("dummyTest", Test) {
     enabled = false
@@ -42,7 +42,7 @@ tasks.register("dummyIntegTest", Test) {
 }
 
 integTest {
-    systemProperty 'jacoco.dir', "${jacocoDir}"
+    systemProperty 'jacoco.dir', jacocoDir
 }
 
 jacocoTestReport {
@@ -51,11 +51,17 @@ jacocoTestReport {
     mustRunAfter test, integTest
 
     // Configure execution data to use any available .exec files
-    executionData.setFrom(fileTree(dir: jacocoDir, include: '*.exec').files.findAll { it.exists() })
+    executionData.from fileTree(dir: jacocoDir, include: '*.exec')
 
     // Make the task skip only if no execution data exists at all
+    // Using a closure to defer the check until execution time
     onlyIf {
-        fileTree(dir: jacocoDir, include: '*.exec').files.any { it.exists() }
+        def execFiles = fileTree(dir: jacocoDir, include: '*.exec').files
+        def hasExecFiles = execFiles.any { it.exists() }
+        if (!hasExecFiles) {
+            println("Skipping jacocoTestReport: No execution data files found in ${jacocoDir}")
+        }
+        hasExecFiles
     }
 
     sourceDirectories.from = "src/main/kotlin"
@@ -77,4 +83,11 @@ allprojects{
             systemProperty 'java.rmi.server.hostname', "127.0.0.1"
         }
     }
+}
+
+// Attach code coverage report task to Gradle check task when coverage is enabled
+if (System.getProperty("tests.coverage")) {
+    project.getTasks().named(JavaBasePlugin.CHECK_TASK_NAME).configure {
+        dependsOn tasks.named('jacocoTestReport', JacocoReport)
+    }
 }

build.gradle

@@ -134,7 +134,6 @@ def usingMultiNode = project.properties.containsKey('numNodes')
 if (!usingRemoteCluster && !usingMultiNode) {
     apply from: 'build-tools/coverage.gradle'
 }
-check.dependsOn jacocoTestReport
 
 opensearchplugin {
     name 'opensearch-index-management'

spi/build.gradle

@@ -44,7 +44,6 @@ jacocoTestReport {
         html.destination file("${buildDir}/jacoco/")
     }
 }
-check.dependsOn jacocoTestReport
 
 repositories {
     mavenLocal()