Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CI] Combines Jest unit tests #89948

Merged
merged 2 commits into from
Feb 9, 2021

Conversation

tylersmalley
Copy link
Contributor

@tylersmalley tylersmalley commented Feb 1, 2021

Re-do of #85850. It was reverted as we thought it was the cause of Jest instability, however, that ended up being caused by resource contention. We are no longer always generating code coverage with this change and will attempt that at a later date.

Previous:
c2-standard-8 - 7 min 57 sec (oss)
c2-standard-8 - 27 min (X-Pack)

image

c2-standard-8 - 48 min

image

n2-standard-16 - 32 min

image

@tylersmalley tylersmalley force-pushed the jest-single-take2 branch 9 times, most recently from 5401c9c to a425f3a Compare February 3, 2021 16:30
@spalger
Copy link
Contributor

spalger commented Feb 3, 2021

jenkins test this

@tylersmalley tylersmalley force-pushed the jest-single-take2 branch 6 times, most recently from 94aaa10 to bc501d8 Compare February 8, 2021 18:31
Tyler Smalley added 2 commits February 8, 2021 13:14
Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

  • 💔 Build #104838 failed bc501d88411ce5d9674857d02d5a6af863605661
  • 💔 Build #104805 failed 94aaa1074085eeb02364a0e7f8a9aeb7345eda58
  • 💔 Build #104733 failed 6007c717d2d921600f556dd894605ee0368ff283
  • 💔 Build #104577 failed fcb602c3291c3452e0c7a866719d2d49513d21b2
  • 💔 Build #104497 failed f61613623e13a48d75c7cefd784ce984142e7034

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

@tylersmalley tylersmalley marked this pull request as ready for review February 8, 2021 23:36
@tylersmalley tylersmalley requested review from a team as code owners February 8, 2021 23:36
@tylersmalley tylersmalley added auto-backport Deprecated - use backport:version if exact versions are needed release_note:skip Skip the PR/issue when compiling release notes v7.12.0 v8.0.0 labels Feb 8, 2021
@tylersmalley
Copy link
Contributor Author

This is ready - I reverted the changes to always run code coverage and will address those issues separately. cc: @dmlemeshko

@tylersmalley tylersmalley enabled auto-merge (squash) February 8, 2021 23:38
@tylersmalley tylersmalley merged commit 08c08e8 into elastic:master Feb 9, 2021
@kibanamachine
Copy link
Contributor

Backport result

{"level":"info","message":"POST https://api.github.com/graphql (status: 200)"}
{"level":"info","message":"POST https://api.github.com/graphql (status: 200)"}
{"meta":{"labels":["auto-backport","release_note:skip","v7.12.0","v8.0.0"],"branchLabelMapping":{"^v8.0.0$":"master","^v7.12.0$":"7.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"},"existingTargetPullRequests":[]},"level":"info","message":"Inputs when calculating target branches:"}
{"meta":["7.x"],"level":"info","message":"Target branches inferred from labels:"}
{"meta":{"killed":false,"code":2,"signal":null,"cmd":"git remote rm kibanamachine","stdout":"","stderr":"error: No such remote: 'kibanamachine'\n"},"level":"info","message":"exec error 'git remote rm kibanamachine':"}
{"meta":{"killed":false,"code":2,"signal":null,"cmd":"git remote rm elastic","stdout":"","stderr":"error: No such remote: 'elastic'\n"},"level":"info","message":"exec error 'git remote rm elastic':"}
{"level":"info","message":"Backporting [{\"sourceBranch\":\"master\",\"targetBranchesFromLabels\":[\"7.x\"],\"sha\":\"08c08e88d93e525d7c00016830e35fe2080ccd72\",\"formattedMessage\":\"[CI] Combines Jest unit tests (#89948)\",\"originalMessage\":\"[CI] Combines Jest unit tests (#89948)\\n\\nSigned-off-by: Tyler Smalley <tyler.smalley@elastic.co>\",\"pullNumber\":89948,\"existingTargetPullRequests\":[]}] to 7.x"}

Backporting to 7.x:
{"level":"info","message":"Backporting via filesystem"}
{"meta":{"killed":false,"code":1,"signal":null,"cmd":"git cherry-pick 08c08e88d93e525d7c00016830e35fe2080ccd72","stdout":"CONFLICT (modify/delete): x-pack/jest.config.js deleted in 08c08e88d93 ([CI] Combines Jest unit tests (#89948)) and modified in HEAD. Version HEAD of x-pack/jest.config.js left in tree.\nAuto-merging vars/kibanaPipeline.groovy\nCONFLICT (modify/delete): vars/kibanaCoverage.groovy deleted in HEAD and modified in 08c08e88d93 ([CI] Combines Jest unit tests (#89948)). Version 08c08e88d93 ([CI] Combines Jest unit tests (#89948)) of vars/kibanaCoverage.groovy left in tree.\nRemoving test/scripts/test/xpack_jest_unit.sh\nCONFLICT (modify/delete): test/scripts/jenkins_xpack.sh deleted in 08c08e88d93 ([CI] Combines Jest unit tests (#89948)) and modified in HEAD. Version HEAD of test/scripts/jenkins_xpack.sh left in tree.\nAuto-merging test/scripts/jenkins_unit.sh\nCONFLICT (content): Merge conflict in test/scripts/jenkins_unit.sh\nCONFLICT (modify/delete): src/dev/code_coverage/shell_scripts/extract_archives.sh deleted in HEAD and modified in 08c08e88d93 ([CI] Combines Jest unit tests (#89948)). Version 08c08e88d93 ([CI] Combines Jest unit tests (#89948)) of src/dev/code_coverage/shell_scripts/extract_archives.sh left in tree.\nAuto-merging packages/kbn-test/jest-preset.js\nCONFLICT (modify/delete): jest.config.oss.js deleted in 08c08e88d93 ([CI] Combines Jest unit tests (#89948)) and modified in HEAD. Version HEAD of jest.config.oss.js left in tree.\nAuto-merging .ci/jobs.yml\n","stderr":"error: could not apply 08c08e88d93... [CI] Combines Jest unit tests (#89948)\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n"},"level":"info","message":"exec error 'git cherry-pick 08c08e88d93e525d7c00016830e35fe2080ccd72':"}
{"meta":{"killed":false,"code":2,"signal":null,"cmd":"git --no-pager diff --check","stdout":"test/scripts/jenkins_unit.sh:5: leftover conflict marker\ntest/scripts/jenkins_unit.sh:29: leftover conflict marker\ntest/scripts/jenkins_unit.sh:61: leftover conflict marker\n","stderr":""},"level":"info","message":"exec error 'git --no-pager diff --check':"}
Commit could not be cherrypicked due to conflicts

tylersmalley pushed a commit to tylersmalley/kibana that referenced this pull request Feb 9, 2021
Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
# Conflicts:
#	jest.config.oss.js
#	src/dev/code_coverage/shell_scripts/extract_archives.sh
#	test/scripts/jenkins_unit.sh
#	test/scripts/jenkins_xpack.sh
#	vars/kibanaCoverage.groovy
#	x-pack/jest.config.js
tylersmalley pushed a commit that referenced this pull request Feb 9, 2021
* [CI] Combines Jest unit tests (#89948)

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
# Conflicts:
#	jest.config.oss.js
#	src/dev/code_coverage/shell_scripts/extract_archives.sh
#	test/scripts/jenkins_unit.sh
#	test/scripts/jenkins_xpack.sh
#	vars/kibanaCoverage.groovy
#	x-pack/jest.config.js

* Fix bad merge

Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co>
@dmlemeshko dmlemeshko mentioned this pull request Feb 10, 2021
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Deprecated - use backport:version if exact versions are needed release_note:skip Skip the PR/issue when compiling release notes v7.12.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants