[coverage] fix jest report merging

src/dev/code_coverage/shell_scripts/copy_jest_report.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+EXTRACT_START_DIR=tmp/extracted_coverage
+EXTRACT_END_DIR=target/kibana-coverage
+COMBINED_EXRACT_DIR=/${EXTRACT_START_DIR}/${EXTRACT_END_DIR}
+
+
+echo "### Copy combined jest report"
+mkdir -p $EXTRACT_END_DIR/jest-combined
+cp -r $COMBINED_EXRACT_DIR/jest-combined/. $EXTRACT_END_DIR/jest-combined/

src/dev/code_coverage/shell_scripts/fix_html_reports_parallel.sh

@@ -7,12 +7,6 @@ COMBINED_EXRACT_DIR=/${EXTRACT_START_DIR}/${EXTRACT_END_DIR}
 PWD=$(pwd)
 du -sh $COMBINED_EXRACT_DIR
 
-echo "### Jest: replacing path in json files"
-for i in oss oss-integration xpack;  do
-  sed -i "s|/dev/shm/workspace/kibana|${PWD}|g" $COMBINED_EXRACT_DIR/jest/${i}-coverage-final.json &
-done
-wait
-
 echo "### Functional: replacing path in json files"
 for i in {1..9}; do
   sed -i "s|/dev/shm/workspace/kibana|${PWD}|g" $COMBINED_EXRACT_DIR/functional/${i}*.json &

src/dev/code_coverage/shell_scripts/generate_team_assignments_and_ingest_coverage.sh

@@ -32,11 +32,18 @@ TEAM_ASSIGN_PATH=$5
 # Build team assignments dat file
 node scripts/generate_team_assignments.js --verbose --src .github/CODEOWNERS --dest $TEAM_ASSIGN_PATH
 
-for x in jest functional; do
-  echo "### Ingesting coverage for ${x}"
+echo "### Ingesting coverage for functional"
 
-  COVERAGE_SUMMARY_FILE=target/kibana-coverage/${x}-combined/coverage-summary.json
+COVERAGE_SUMMARY_FILE=target/kibana-coverage/functional-combined/coverage-summary.json
+node scripts/ingest_coverage.js --verbose --path ${COVERAGE_SUMMARY_FILE} --vcsInfoPath ./VCS_INFO.txt --teamAssignmentsPath $TEAM_ASSIGN_PATH
 
+for x in functional jest; do
+  echo "### Ingesting coverage for ${x}"
+    COVERAGE_SUMMARY_FILE=target/kibana-coverage/${x}-combined/coverage-summary.json
+    if [[ $x == "jest" ]]; then
+        # Need to override COVERAGE_INGESTION_KIBANA_ROOT since json file has original intake worker path
+        export COVERAGE_INGESTION_KIBANA_ROOT=/dev/shm/workspace/kibana
+    fi
   node scripts/ingest_coverage.js --verbose --path ${COVERAGE_SUMMARY_FILE} --vcsInfoPath ./VCS_INFO.txt --teamAssignmentsPath $TEAM_ASSIGN_PATH
 done
 

src/dev/code_coverage/shell_scripts/merge_jest_and_functional.sh → src/dev/code_coverage/shell_scripts/merge_functional.sh

@@ -4,6 +4,4 @@ COVERAGE_TEMP_DIR=/tmp/extracted_coverage/target/kibana-coverage/
 export COVERAGE_TEMP_DIR
 
 echo "### Merge coverage reports"
-for x in jest functional; do
-  yarn nyc report --nycrc-path src/dev/code_coverage/nyc_config/nyc.${x}.config.js
-done
+yarn nyc report --nycrc-path src/dev/code_coverage/nyc_config/nyc.functional.config.js

test/scripts/jenkins_unit.sh

@@ -32,4 +32,7 @@ else
 
   echo " -> Running jest integration tests with coverage"
   node scripts/jest_integration --ci --verbose --coverage || true;
+
+  echo " -> Combine code coverage in a single report"
+  yarn nyc report --nycrc-path src/dev/code_coverage/nyc_config/nyc.jest.config.js
 fi

vars/kibanaCoverage.groovy

@@ -148,9 +148,10 @@ def generateReports(title) {
     cd ..
     . src/dev/code_coverage/shell_scripts/extract_archives.sh
     . src/dev/code_coverage/shell_scripts/fix_html_reports_parallel.sh
-    . src/dev/code_coverage/shell_scripts/merge_jest_and_functional.sh
-    # zip combined reports
-    tar -czf kibana-coverage.tar.gz target/kibana-coverage/**/*
+    . src/dev/code_coverage/shell_scripts/merge_functional.sh
+    . src/dev/code_coverage/shell_scripts/copy_jest_report.sh
+    # zip functional combined report
+    tar -czf kibana-functional-coverage.tar.gz target/kibana-coverage/functional/*
   """, title)
 }
 
@@ -162,7 +163,7 @@ def uploadCombinedReports() {
 
   kibanaPipeline.uploadGcsArtifact(
     "kibana-ci-artifacts/jobs/${env.JOB_NAME}/${BUILD_NUMBER}/coverage/combined",
-    'kibana-coverage.tar.gz'
+    'kibana-functional-coverage.tar.gz'
   )
 }
 

vars/kibanaPipeline.groovy

@@ -181,7 +181,7 @@ def withGcsArtifactUpload(workerName, closure) {
   def ARTIFACT_PATTERNS = [
     'target/junit/**/*',
     'target/kibana-*',
-    'target/kibana-coverage/**/*',
+    'target/kibana-coverage/jest/**/*',
     'target/kibana-security-solution/**/*.png',
     'target/test-metrics/*',
     'target/test-suites-ci-plan.json',