[coverage] fix jest merging #90915

dmlemeshko · 2021-02-10T10:11:44Z

Summary

Follow-up to #89948
PR fixes code coverage collection for jest tests

https://kibana-ci.elastic.co/job/elastic+kibana+qa-research/189

with coverage plugin id fix
https://kibana-ci.elastic.co/job/elastic+kibana+qa-research/192

Checklist

Delete any items that are not applicable to this PR.

Any text added follows EUI's writing guidelines, uses sentence case text and includes i18n support
Documentation was added for features that require explanation or tutorials
Unit or functional tests were updated or added to match the most common scenarios
Any UI touched in this PR is usable by keyboard only (learn more about keyboard accessibility)
Any UI touched in this PR does not create any new axe failures (run axe in browser: FF, Chrome)
If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the docker list
This renders correctly on smaller devices using a responsive layout. (You can test this in your browser)
This was checked for cross-browser compatibility

For maintainers

This was checked for breaking API changes and was labeled appropriately

dmlemeshko · 2021-02-13T10:01:12Z

@tylersmalley we actually need this change to make coverage work again. Jest tests no longer need merging so I moved report generation right after tests execution. Still we need to store jest report in artefacts for later ingestion to stats. Other changes are mostly cleanup

dmlemeshko · 2021-02-14T16:40:46Z

@elasticmachine merge upstream

dmlemeshko · 2021-02-15T10:21:41Z

@elasticmachine merge upstream

mistic

LGTM

…a into fix-code-coverage-merge

dmlemeshko · 2021-02-16T15:13:42Z

test/common/fixtures/plugins/coverage/kibana.json

@@ -1,5 +1,5 @@
 {
-  "id": "coverage-fixtures",
+  "id": "coverageFixtures",


After merging master on Monday I faced this error in functional tests:

11:37:23 │ proc [kibana] FATAL Error: Failed to initialize plugins: 11:37:23 │ proc [kibana] Plugin "id" must be camelCase, but found: coverage-fixtures. (invalid-manifest, /dev/shm/workspace/kibana12/test/common/fixtures/plugins/coverage/kibana.json)

I changed plugin id according error an looks like it is working fine

dmlemeshko · 2021-02-16T15:15:02Z

test/scripts/jenkins_unit.sh

+
+  echo " -> Combine code coverage in a single report"
+  yarn nyc report --nycrc-path src/dev/code_coverage/nyc_config/nyc.jest.config.js


Since we run jest tests in a single place now, I added report generation right after tests are done.

dmlemeshko · 2021-02-16T15:17:25Z

vars/kibanaCoverage.groovy

-    . 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-combined/*


We only merge functional tests now, but we still need to copy jest for ingestion. Functional combined report is uploaded separately since jest was already in artefacts after tests execution.

dmlemeshko · 2021-02-16T15:19:03Z

vars/kibanaPipeline.groovy

@@ -188,7 +188,7 @@ def withGcsArtifactUpload(workerName, closure) {
  def ARTIFACT_PATTERNS = [
    'target/junit/**/*',
    'target/kibana-*',
-    'target/kibana-coverage/**/*',
+    'target/kibana-coverage/jest/**/*',


We should not upload kibana-coverage/functional content to artefacts since it is 30 GB of json files and we are not interested in them individually.

LeeDr

LGTM - assuming the qa-research job works as expected

kibanamachine · 2021-02-16T15:43:40Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request
Commit: 26d80be

Metrics [docs]

✅ unchanged

History

💚 Build #106535 succeeded 9a252f4
💚 Build #106451 succeeded 0831501
💚 Build #106393 succeeded c51b2d7
💚 Build #106359 succeeded 93b3a6f
💚 Build #105517 succeeded 64d698d

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

[coverage] fix jest merging

64d698d

dmlemeshko added v8.0.0 backport:skip This commit does not require backporting release_note:skip Skip the PR/issue when compiling release notes labels Feb 10, 2021

dmlemeshko added 4 commits February 12, 2021 11:44

fix path to functional results

bfb433c

revert wrong change

93b3a6f

fix ingest script

d45324a

fix ingest script

c51b2d7

dmlemeshko marked this pull request as ready for review February 13, 2021 09:58

dmlemeshko requested review from a team as code owners February 13, 2021 09:58

dmlemeshko added the code coverage Issues & PRs about code coverage label Feb 13, 2021

dmlemeshko mentioned this pull request Feb 13, 2021

[coverage] fix jest report merging #89537

Closed

Merge branch 'master' into fix-code-coverage-merge

0831501

Merge branch 'master' into fix-code-coverage-merge

9a252f4

mistic approved these changes Feb 15, 2021

View reviewed changes

dmlemeshko added 2 commits February 16, 2021 14:30

[coverage plugin] change id to camelCase

ce22bdc

Merge branch 'fix-code-coverage-merge' of github.com:dmlemeshko/kiban…

26d80be

…a into fix-code-coverage-merge

dmlemeshko commented Feb 16, 2021

View reviewed changes

LeeDr approved these changes Feb 16, 2021

View reviewed changes

dmlemeshko merged commit 2fe0d05 into elastic:master Feb 16, 2021

dmlemeshko deleted the fix-code-coverage-merge branch January 31, 2022 12:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[coverage] fix jest merging #90915

[coverage] fix jest merging #90915

dmlemeshko commented Feb 10, 2021 •

edited

Loading

dmlemeshko commented Feb 13, 2021 •

edited

Loading

dmlemeshko commented Feb 14, 2021

dmlemeshko commented Feb 15, 2021

mistic left a comment

dmlemeshko Feb 16, 2021

dmlemeshko Feb 16, 2021

dmlemeshko Feb 16, 2021 •

edited

Loading

dmlemeshko Feb 16, 2021

LeeDr left a comment

kibanamachine commented Feb 16, 2021


		echo " -> Combine code coverage in a single report"
		yarn nyc report --nycrc-path src/dev/code_coverage/nyc_config/nyc.jest.config.js

[coverage] fix jest merging #90915

[coverage] fix jest merging #90915

Conversation

dmlemeshko commented Feb 10, 2021 • edited Loading

Summary

Checklist

For maintainers

dmlemeshko commented Feb 13, 2021 • edited Loading

dmlemeshko commented Feb 14, 2021

dmlemeshko commented Feb 15, 2021

mistic left a comment

Choose a reason for hiding this comment

dmlemeshko Feb 16, 2021

Choose a reason for hiding this comment

dmlemeshko Feb 16, 2021

Choose a reason for hiding this comment

dmlemeshko Feb 16, 2021 • edited Loading

Choose a reason for hiding this comment

dmlemeshko Feb 16, 2021

Choose a reason for hiding this comment

LeeDr left a comment

Choose a reason for hiding this comment

kibanamachine commented Feb 16, 2021

💚 Build Succeeded

Metrics [docs]

History

dmlemeshko commented Feb 10, 2021 •

edited

Loading

dmlemeshko commented Feb 13, 2021 •

edited

Loading

dmlemeshko Feb 16, 2021 •

edited

Loading