[Security Solution] Fix related_integrations Cypress test flake #173393
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jpdjere
added
release_note:skip
|
Pinging @elastic/security-detections-response (Team:Detections and Resp) |
|
Pinging @elastic/security-solution (Team: SecuritySolution) |
|
@elasticmachine merge upstream |
banderror
approved these changes
Dec 18, 2023
There was a problem hiding this comment.
@jpdjere Thank you for quickly picking up this issue. I left a comment below.
I think I'd be ok with merging this PR despite the comment, because:
- The code after the change doesn't look more flaky and more explicitly reflects our intentions.
- The Flaky Test Runner is happy. The only failure was because an agent was lost.
|
|
||
| const INSTALLED_PREBUILT_RULES_RESPONSE_ALIAS = 'prebuiltRules'; | ||
|
|
||
| function addAndInstallPrebuiltRules(rules: Array<typeof SAMPLE_PREBUILT_RULE>): void { | ||
| installPrebuiltRuleAssets(rules); | ||
| installAllPrebuiltRulesRequest().as(INSTALLED_PREBUILT_RULES_RESPONSE_ALIAS); | ||
| installSpecificPrebuiltRulesRequest(rules).as(INSTALLED_PREBUILT_RULES_RESPONSE_ALIAS); |
There was a problem hiding this comment.
@jpdjere Not sure I understand how this change is supposed to reduce flakiness.
The installPrebuiltRuleAssets function calls preventPrebuiltRulesPackageInstallation under the hood, which means installAllPrebuiltRulesRequest should be installing only the test rules assets specified in this test, and not all real prebuilt rules from the package.
The "before" and "after" code look identical to me in terms of the end result.
On the other hand, I see this in the PR description: "This stops flake in which a race condition would case the full Fleet package installation to be installed, and then us purposely installing all rules." Can you elaborate on this?
|
@elasticmachine merge upstream |
💚 Build Succeeded
Metrics [docs]
History
To update your PR or re-run it, just comment with: cc @jpdjere |
💔 All backports failed
Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
banderror
pushed a commit
to banderror/kibana
that referenced
this pull request
Dec 20, 2023
…tic#173393) ## Summary - Replaces the installation of all available prebuilt rule for the rule that was just created. This stops flake in which a race condition would case the full Fleet package installation to be installed, and then us purposely installing **all** rules. ## Flaky test runner https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/4574 ### For maintainers - [ ] This was checked for breaking API changes and was [labeled appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process) --------- Co-authored-by: Kibana Machine <[email protected]> (cherry picked from commit d0e5c29) # Conflicts: # x-pack/test/security_solution_cypress/cypress/e2e/detection_response/rule_management/related_integrations/related_integrations.cy.ts
banderror
added a commit
that referenced
this pull request
Dec 20, 2023
#173393) (#173680) # Backport This will backport the following commits from `main` to `8.12`: - [[Security Solution] Fix related_integrations Cypress test flake (#173393)](#173393) <!--- Backport version: 8.9.8 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sqren/backport) <!--BACKPORT [{"author":{"name":"Juan Pablo Djeredjian","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-12-19T13:00:17Z","message":"[Security Solution] Fix related_integrations Cypress test flake (#173393)\n\n## Summary\r\n\r\n- Replaces the installation of all available prebuilt rule for the rule\r\nthat was just created. This stops flake in which a race condition would\r\ncase the full Fleet package installation to be installed, and then us\r\npurposely installing **all** rules.\r\n\r\n## Flaky test runner\r\n\r\nhttps://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/4574\r\n\r\n### For maintainers\r\n\r\n- [ ] This was checked for breaking API changes and was [labeled\r\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine <[email protected]>","sha":"d0e5c290789b7a5bb40a4099ede169dafc6f5ad3","branchLabelMapping":{"^v8.13.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Detections and Resp","Team: SecuritySolution","Team:Detection Rule Management","v8.12.0","v8.13.0"],"number":173393,"url":"https://github.com/elastic/kibana/pull/173393","mergeCommit":{"message":"[Security Solution] Fix related_integrations Cypress test flake (#173393)\n\n## Summary\r\n\r\n- Replaces the installation of all available prebuilt rule for the rule\r\nthat was just created. This stops flake in which a race condition would\r\ncase the full Fleet package installation to be installed, and then us\r\npurposely installing **all** rules.\r\n\r\n## Flaky test runner\r\n\r\nhttps://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/4574\r\n\r\n### For maintainers\r\n\r\n- [ ] This was checked for breaking API changes and was [labeled\r\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine <[email protected]>","sha":"d0e5c290789b7a5bb40a4099ede169dafc6f5ad3"}},"sourceBranch":"main","suggestedTargetBranches":["8.12"],"targetPullRequestStates":[{"branch":"8.12","label":"v8.12.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.13.0","labelRegex":"^v8.13.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/173393","number":173393,"mergeCommit":{"message":"[Security Solution] Fix related_integrations Cypress test flake (#173393)\n\n## Summary\r\n\r\n- Replaces the installation of all available prebuilt rule for the rule\r\nthat was just created. This stops flake in which a race condition would\r\ncase the full Fleet package installation to be installed, and then us\r\npurposely installing **all** rules.\r\n\r\n## Flaky test runner\r\n\r\nhttps://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/4574\r\n\r\n### For maintainers\r\n\r\n- [ ] This was checked for breaking API changes and was [labeled\r\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\r\n\r\n---------\r\n\r\nCo-authored-by: Kibana Machine <[email protected]>","sha":"d0e5c290789b7a5bb40a4099ede169dafc6f5ad3"}}]}] BACKPORT--> Co-authored-by: Juan Pablo Djeredjian <[email protected]>
This was referenced Dec 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Flaky test runner
https://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/4574
For maintainers