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

[EDR Workflows] Revert skipped Cypress tests #204216

Merged
merged 46 commits into from
Dec 13, 2024

Conversation

tomsonpl
Copy link
Contributor

@tomsonpl tomsonpl commented Dec 13, 2024

Closes:

@tomsonpl tomsonpl added Team:Defend Workflows “EDR Workflows” sub-team of Security Solution backport:version Backport to applied version labels labels Dec 13, 2024
@tomsonpl tomsonpl marked this pull request as ready for review December 13, 2024 14:51
@tomsonpl tomsonpl requested a review from a team as a code owner December 13, 2024 14:51
@elasticmachine
Copy link
Contributor

Pinging @elastic/security-defend-workflows (Team:Defend Workflows)

Copy link
Member

@ashokaditya ashokaditya left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀 🚢

@tomsonpl tomsonpl added v8.16.3 and removed v8.16.2 labels Dec 13, 2024
@tomsonpl tomsonpl enabled auto-merge (squash) December 13, 2024 14:56
@tomsonpl tomsonpl merged commit 6c61ded into elastic:main Dec 13, 2024
25 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.16, 8.17, 8.x

https://github.com/elastic/kibana/actions/runs/12318898411

@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] Jest Tests #13 / AgentBasedPackagePoliciesTable renders the table with package policies
  • [job] [logs] Jest Tests #15 / UserName should not open any flyout or panels if timelineID is not defined

Metrics [docs]

✅ unchanged

cc @tomsonpl

@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
8.16 Backport failed because of merge conflicts
8.17 Backport failed because of merge conflicts
8.x Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 204216

Questions ?

Please refer to the Backport tool documentation

tomsonpl added a commit to tomsonpl/kibana that referenced this pull request Dec 16, 2024
(cherry picked from commit 6c61ded)

# Conflicts:
#	x-pack/plugins/security_solution/public/management/cypress/e2e/artifacts/artifact_tabs_in_policy_details.cy.ts
#	x-pack/plugins/security_solution/public/management/cypress/e2e/artifacts/event_filters.cy.ts
#	x-pack/plugins/security_solution/public/management/cypress/e2e/automated_response_actions/no_license.cy.ts
#	x-pack/plugins/security_solution/public/management/cypress/e2e/response_actions/response_console/process_operations.cy.ts
tomsonpl added a commit to tomsonpl/kibana that referenced this pull request Dec 16, 2024
(cherry picked from commit 6c61ded)

# Conflicts:
#	x-pack/plugins/security_solution/public/management/cypress/e2e/endpoint_list/endpoints_rbac_mocked_data.cy.ts
#	x-pack/plugins/security_solution/public/management/cypress/e2e/response_actions/response_console/process_operations.cy.ts
@tomsonpl
Copy link
Contributor Author

💔 Some backports could not be created

Status Branch Result
8.x
8.17
8.16 Conflict resolution was aborted by the user

Note: Successful backport PRs will be merged automatically after passing CI.

Manual backport

To create the backport manually run:

node scripts/backport --pr 204216

Questions ?

Please refer to the Backport tool documentation

@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Dec 16, 2024
@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

tomsonpl added a commit that referenced this pull request Dec 17, 2024
# Backport

This will backport the following commits from `main` to `8.x`:
- [[EDR Workflows] Revert skipped Cypress tests
(#204216)](#204216)

<!--- Backport version: 8.9.8 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Tomasz
Ciecierski","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-12-13T15:58:17Z","message":"[EDR
Workflows] Revert skipped Cypress tests
(#204216)","sha":"6c61ded48e98b5679f35dd86dd683d9d07506db7","branchLabelMapping":{"^v9.0.0$":"main","^v8.18.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","Team:Defend
Workflows","backport:version","v8.18.0","v8.16.3","v8.17.1"],"number":204216,"url":"https://github.com/elastic/kibana/pull/204216","mergeCommit":{"message":"[EDR
Workflows] Revert skipped Cypress tests
(#204216)","sha":"6c61ded48e98b5679f35dd86dd683d9d07506db7"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","8.16","8.17"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/204216","number":204216,"mergeCommit":{"message":"[EDR
Workflows] Revert skipped Cypress tests
(#204216)","sha":"6c61ded48e98b5679f35dd86dd683d9d07506db7"}},{"branch":"8.x","label":"v8.18.0","labelRegex":"^v8.18.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.16","label":"v8.16.3","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.17","label":"v8.17.1","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Dec 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:version Backport to applied version labels release_note:skip Skip the PR/issue when compiling release notes Team:Defend Workflows “EDR Workflows” sub-team of Security Solution v8.18.0 v9.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants