test(NODE-3897): re-enable combined coverage (#3375)

durran · web-flow · commit 4e55a04c1beb · 2022-10-20T16:18:10.000-04:00
diff --git a/.evergreen/config.in.yml b/.evergreen/config.in.yml
@@ -850,7 +850,7 @@ functions:
         local_file:  src/coverage/coverage-final.json
         optional: true
         # Upload the coverage report for all tasks in a single build to the same directory.
-        # TODO NODE-3897 - change upload directory to mongo-node-driver-next
+        # TODO NODE-4707 - change upload directory to ${UPLOAD_BUCKET} 
         # This change will require changing the `download and merge coverage` func as well
         remote_file: mongo-node-driver/${revision}/${version_id}/coverage.${build_variant}.${task_name}.json
         bucket: mciuploads
@@ -861,21 +861,45 @@ functions:
   "download and merge coverage":
     - command: shell.exec
       params:
-        silent: true
         working_dir: "src"
         script: |
           ${PREPARE_SHELL}
           export AWS_ACCESS_KEY_ID=${aws_key}
           export AWS_SECRET_ACCESS_KEY=${aws_secret}
-          # Download all the task coverage files.
-          # TODO NODE-3897 - finish this function.  the code below this point is untested because
-          #   aws s3 cp fails due to permissions errors
-          aws s3 cp --recursive s3://mciuploads/mongo-node-driver/${revision}/${version_id}/ coverage/
 
+          # Download all the task coverage files.
+          # NOTE: All coverage files are too large for V8 to handle the resulting call to
+          #       JSON.stringify from within nyc, so with stick to Fermiun to include the
+          #       compression tests.
+          aws s3 cp --recursive s3://mciuploads/mongo-node-driver/${revision}/${version_id}/ \
+            coverage/ \
+            --exclude "*rhel80-large*" \
+            --include "*fermiun"
+
+          # npx does not recognize the dependency so install it directly.
+          npm install @istanbuljs/nyc-config-typescript
+          cd coverage
+          sed -i'' -e 's/\/data\/mci\/.\{32\}\/src\///g' *
+          ls -la
+          cd ..
           npx nyc merge coverage/ merged-coverage/coverage.json
-          npx nyc report -t merged-coverage --reporter=html --report-dir output
+          npx nyc report -t merged-coverage/ --reporter=html --report-dir coverage-report
 
-          aws s3 cp output/lcov-report s3://mciuploads/mongo-node-driver/${revision}/${version_id}//lcov-report/
+          aws s3 cp coverage-report/ \
+            s3://mciuploads/mongo-node-driver/${revision}/${version_id}/coverage/ \
+            --recursive \
+            --acl public-read \
+            --region us-east-1
+    - command: s3.put
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file:  src/coverage-report/index.html
+        remote_file: mongo-node-driver/${revision}/${version_id}/coverage/index.html
+        bucket: mciuploads
+        permissions: public-read
+        content_type: text/html
+        display_name: "Coverage Report HTML"
 
   "run spec driver benchmarks":
     - command: subprocess.exec
diff --git a/.evergreen/config.yml b/.evergreen/config.yml
@@ -809,21 +809,45 @@ functions:
   download and merge coverage:
     - command: shell.exec
       params:
-        silent: true
         working_dir: src
         script: |
           ${PREPARE_SHELL}
           export AWS_ACCESS_KEY_ID=${aws_key}
           export AWS_SECRET_ACCESS_KEY=${aws_secret}
+
           # Download all the task coverage files.
-          # TODO NODE-3897 - finish this function.  the code below this point is untested because
-          #   aws s3 cp fails due to permissions errors
-          aws s3 cp --recursive s3://mciuploads/mongo-node-driver/${revision}/${version_id}/ coverage/
+          # NOTE: All coverage files are too large for V8 to handle the resulting call to
+          #       JSON.stringify from within nyc, so with stick to Fermiun to include the
+          #       compression tests.
+          aws s3 cp --recursive s3://mciuploads/mongo-node-driver/${revision}/${version_id}/ \
+            coverage/ \
+            --exclude "*rhel80-large*" \
+            --include "*fermiun"
 
+          # npx does not recognize the dependency so install it directly.
+          npm install @istanbuljs/nyc-config-typescript
+          cd coverage
+          sed -i'' -e 's/\/data\/mci\/.\{32\}\/src\///g' *
+          ls -la
+          cd ..
           npx nyc merge coverage/ merged-coverage/coverage.json
-          npx nyc report -t merged-coverage --reporter=html --report-dir output
+          npx nyc report -t merged-coverage/ --reporter=html --report-dir coverage-report
 
-          aws s3 cp output/lcov-report s3://mciuploads/mongo-node-driver/${revision}/${version_id}//lcov-report/
+          aws s3 cp coverage-report/ \
+            s3://mciuploads/mongo-node-driver/${revision}/${version_id}/coverage/ \
+            --recursive \
+            --acl public-read \
+            --region us-east-1
+    - command: s3.put
+      params:
+        aws_key: ${aws_key}
+        aws_secret: ${aws_secret}
+        local_file: src/coverage-report/index.html
+        remote_file: mongo-node-driver/${revision}/${version_id}/coverage/index.html
+        bucket: mciuploads
+        permissions: public-read
+        content_type: text/html
+        display_name: Coverage Report HTML
   run spec driver benchmarks:
     - command: subprocess.exec
       type: test
@@ -2061,6 +2085,15 @@ tasks:
         vars:
           NODE_LTS_NAME: gallium
       - func: run mongosh integration tests
+  - name: download-and-merge-coverage
+    tags: []
+    commands:
+      - func: download and merge coverage
+    depends_on:
+      - name: '*'
+        variant: '*'
+        status: '*'
+        patch_optional: true
   - name: run-custom-snappy-tests
     tags:
       - run-custom-dependency-tests
@@ -2974,6 +3007,11 @@ buildvariants:
       - run-typescript-current
       - run-typescript-oldest
       - run-typescript-next
+  - name: generate-combined-coverage
+    display_name: Generate Combined Coverage
+    run_on: rhel80-large
+    tasks:
+      - download-and-merge-coverage
   - name: mongosh_integration_tests
     display_name: mongosh integration tests
     run_on: ubuntu1804-large
diff --git a/.evergreen/generate_evergreen_tasks.js b/.evergreen/generate_evergreen_tasks.js
@@ -501,13 +501,12 @@ BUILD_VARIANTS.push({
   ]
 });
 
-// TODO NODE-3897 - generate combined coverage report
-// BUILD_VARIANTS.push({
-//   name: 'generate-combined-coverage',
-//   display_name: 'Generate Combined Coverage',
-//   run_on: DEFAULT_OS,
-//   tasks: ['download-and-merge-coverage']
-// });
+BUILD_VARIANTS.push({
+  name: 'generate-combined-coverage',
+  display_name: 'Generate Combined Coverage',
+  run_on: DEFAULT_OS,
+  tasks: ['download-and-merge-coverage']
+});
 
 // singleton build variant for mongosh integration tests
 SINGLETON_TASKS.push({
@@ -619,7 +618,6 @@ for (const version of ['5.0', 'rapid', 'latest']) {
   }
 }
 
-// TODO NODE-3897 - generate combined coverage report
 const coverageTask = {
   name: 'download and merge coverage'.split(' ').join('-'),
   tags: [],
@@ -631,6 +629,7 @@ const coverageTask = {
   depends_on: [{ name: '*', variant: '*', status: '*', patch_optional: true }]
 };
 
+SINGLETON_TASKS.push(coverageTask);
 SINGLETON_TASKS.push(...oneOffFuncAsTasks);
 
 BUILD_VARIANTS.push({
diff --git a/.evergreen/prepare-shell.sh b/.evergreen/prepare-shell.sh
@@ -11,7 +11,7 @@ PROJECT_DIRECTORY="$(pwd)"
 DRIVERS_TOOLS=$(cd .. && echo "$(pwd)/drivers-tools")
 MONGO_ORCHESTRATION_HOME="$DRIVERS_TOOLS/.evergreen/orchestration"
 MONGODB_BINARIES="$DRIVERS_TOOLS/mongodb/bin"
-UPLOAD_BUCKET="$PROJECT"
+UPLOAD_BUCKET="${project}"
 
 if [ "Windows_NT" = "${OS:-notWindows}" ]; then
   # fix paths on windows
