configured script and ci job to collect and merge ut and it results

Author: chubnastia

.gitlab-ci.yml

@@ -466,6 +466,7 @@ Collect container logs:
     paths:
       - "$K8S_NAMESPACE.log"
       - "$K8S_NAMESPACE-billing.json"
+      - "*.exec"
 
 #
 # dispose kubernetes resources
@@ -835,11 +836,11 @@ get_jacoco_cli:
 
 # Job to generate JaCoCo report using script
 generate_jacoco_report:
-  stage: build
+  stage: testenv_post
   image: eclipse-temurin:17-jre
   needs:
     - job: run_ut_with_coverage
-      artifacts: true
+    - job: Collect container logs
     - job: get_jacoco_cli
   cache:
     key: "jacoco-cli-${JACOCO_VERSION}"
@@ -850,4 +851,8 @@ generate_jacoco_report:
   artifacts:
     paths:
       - target/coverage-reports/site/
+    reports:
+      coverage_report:
+        coverage_format: jacoco
+        path: target/coverage-reports/jacoco-total.xml
     expire_in: 1 week

generate-jacoco-report.sh

@@ -16,13 +16,10 @@ fi
 
 # Ensure the report directory exists
 mkdir -p "$REPORT_DIR"
+EXEC_FILES=$(find "$PROJECT_ROOT" -name "*.exec" -type f)
 
-# Issue 1: Simplified find command (avoiding array initialization)
-EXEC_FILES=$(find "$PROJECT_ROOT" -name "jacoco-ut.exec" -type f)
-
-# Issue 2: Simplified check for empty results using -z
 if [ -z "$EXEC_FILES" ]; then
-    echo "Error: No jacoco-ut.exec files found in $PROJECT_ROOT"
+    echo "Error: No .exec files found in $PROJECT_ROOT"
     exit 1
 fi
 
@@ -43,21 +40,20 @@ echo "Generating coverage report..."
 CLASSFILES_ARGS=()
 SOURCEFILES_ARGS=()
 
-# Issue 5: Iterating over the string list instead of an array
-for exec_file in ${EXEC_FILES}; do
-    # Extract module path (e.g., core, dlm, rquota) from the exec file path
-    module_path=$(dirname "$(dirname "$(dirname "$exec_file")")")
-
-    # Add classfiles and sourcefiles arguments
-    CLASSFILES_ARGS+=("--classfiles" "$module_path/target/classes")
-    SOURCEFILES_ARGS+=("--sourcefiles" "$module_path/src/main/java")
+for module in $(find modules -maxdepth 1 -mindepth 1 -type d); do
+    if [ -d "$module/target/classes" ]; then
+        CLASSFILES_ARGS+=("--classfiles" "$module/target/classes")
+        SOURCEFILES_ARGS+=("--sourcefiles" "$module/src/main/java")
+    fi
 done
 
 # Generate the report with dynamic arguments
 java -jar "$JACOCO_CLI_JAR" report "$MERGED_EXEC" \
     "${CLASSFILES_ARGS[@]}" \
     "${SOURCEFILES_ARGS[@]}" \
-    --html "$REPORT_DIR"
+    --html "$REPORT_DIR" \
+    --xml "$PROJECT_ROOT/target/coverage-reports/jacoco-total.xml" \
+    --csv "$PROJECT_ROOT/target/coverage-reports/jacoco-total.csv"
 
 if [ $? -ne 0 ]; then
     echo "Error: Failed to generate coverage report"