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] Fix Osquery cypress 11 #171497

Merged
merged 3 commits into from
Nov 20, 2023

Conversation

@tomsonpl tomsonpl self-assigned this Nov 20, 2023
@tomsonpl tomsonpl added chore Team:Defend Workflows “EDR Workflows” sub-team of Security Solution Feature:Osquery Security Solution Osquery feature v8.12.0 v8.11.2 labels Nov 20, 2023
@tomsonpl tomsonpl marked this pull request as ready for review November 20, 2023 11:17
@tomsonpl tomsonpl requested a review from a team as a code owner November 20, 2023 11:17
@elasticmachine
Copy link
Contributor

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

@tomsonpl tomsonpl requested review from patrykkopycinski and removed request for joeypoon November 20, 2023 11:17
@tomsonpl tomsonpl added the release_note:skip Skip the PR/issue when compiling release notes label Nov 20, 2023
@@ -12,7 +12,7 @@
"cypress:run": "yarn cypress run",
"cypress:serverless": "NODE_OPTIONS=--openssl-legacy-provider node ../security_solution/scripts/start_cypress_parallel --config-file ../osquery/cypress/serverless_cypress.config.ts --ftr-config-file ../../../x-pack/test/osquery_cypress/serverless_cli_config",
"cypress:serverless:open": "yarn cypress:serverless open",
"cypress:serverless:run": "yarn cypress:serverless run --spec ./cypress/e2e/all/packs_integration.cy.ts",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

lol leftover from last week...

@tomsonpl tomsonpl enabled auto-merge (squash) November 20, 2023 14:43
@kibana-ci
Copy link
Collaborator

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

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

cc @tomsonpl

@tomsonpl tomsonpl merged commit d412e57 into elastic:main Nov 20, 2023
26 checks passed
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Nov 20, 2023
@kibanamachine
Copy link
Contributor

💚 All backports created successfully

Status Branch Result
8.11

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

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit to kibanamachine/kibana that referenced this pull request Nov 21, 2023
…ic#171564)

# Backport

This will backport the following commits from `main` to `8.11`:
- [[EDR Workflows] Fix Osquery cypress 11
(elastic#171497)](elastic#171497)

<!--- Backport version: 8.9.7 -->

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

<!--BACKPORT [{"author":{"name":"Tomasz
Ciecierski","email":"[email protected]"},"sourceCommit":{"committedDate":"2023-11-20T17:02:20Z","message":"[EDR
Workflows] Fix Osquery cypress 11
(elastic#171497)","sha":"d412e5789769a415916ee6cbef46e0931f2e222e","branchLabelMapping":{"^v8.12.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","release_note:skip","Team:Defend
Workflows","Feature:Osquery","v8.12.0","v8.11.2"],"number":171497,"url":"https://github.com/elastic/kibana/pull/171497","mergeCommit":{"message":"[EDR
Workflows] Fix Osquery cypress 11
(elastic#171497)","sha":"d412e5789769a415916ee6cbef46e0931f2e222e"}},"sourceBranch":"main","suggestedTargetBranches":["8.11"],"targetPullRequestStates":[{"branch":"main","label":"v8.12.0","labelRegex":"^v8.12.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/171497","number":171497,"mergeCommit":{"message":"[EDR
Workflows] Fix Osquery cypress 11
(elastic#171497)","sha":"d412e5789769a415916ee6cbef46e0931f2e222e"}},{"branch":"8.11","label":"v8.11.2","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Tomasz Ciecierski <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore Feature:Osquery Security Solution Osquery feature release_note:skip Skip the PR/issue when compiling release notes Team:Defend Workflows “EDR Workflows” sub-team of Security Solution v8.11.2 v8.12.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants