Skip to content

[ska] relocate api_integration_basic & defend_workflows_cypress tests#225374

Merged
dmlemeshko merged 6 commits intoelastic:mainfrom
dmlemeshko:ska/relocate-sec-sol-tests
Jun 26, 2025
Merged

[ska] relocate api_integration_basic & defend_workflows_cypress tests#225374
dmlemeshko merged 6 commits intoelastic:mainfrom
dmlemeshko:ska/relocate-sec-sol-tests

Conversation

@dmlemeshko
Copy link
Copy Markdown
Contributor

@dmlemeshko dmlemeshko commented Jun 25, 2025 •
edited
Loading

Summary

Part of https://github.com/elastic/kibana-team/issues/1503

Before:

x-pack/test/
     | - api_integration_basic/
     | - defend_workflows_cypress/

After:

x-pack/solutions/security/test/
     | - api_integration_basic/
     | - defend_workflows_cypress/

@dmlemeshko dmlemeshko self-assigned this Jun 26, 2025
@dmlemeshko dmlemeshko added release_note:skip Skip the PR/issue when compiling release notes backport:skip This PR does not require backporting v9.1.0 v8.19.0 labels Jun 26, 2025
@dmlemeshko dmlemeshko marked this pull request as ready for review June 26, 2025 05:21
@dmlemeshko dmlemeshko requested review from a team as code owners June 26, 2025 05:22
@csr csr self-requested a review June 26, 2025 08:13
csr
csr reviewed Jun 26, 2025
View reviewed changes
x-pack/solutions/security/test/defend_workflows_cypress/serverless_config.ts
Copy link
Copy Markdown
Member

@csr csr Jun 26, 2025

Choose a reason for hiding this comment

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

Will we move serverless configs to the x-pack/solutions/<solution>/test_serverless folder at a later stage?

Copy link
Copy Markdown
Contributor Author

@dmlemeshko dmlemeshko Jun 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

there is no plan to re-org it for Cypress tests at the moment. We will rely on manifest files where configs are listed to test against the specific distro.

csr
csr approved these changes Jun 26, 2025
View reviewed changes
Copy link
Copy Markdown
Member

@csr csr left a comment

Choose a reason for hiding this comment

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

LGTM 👍 I left a few comments.

@dmlemeshko dmlemeshko enabled auto-merge (squash) June 26, 2025 14:18
js-jankisalvi
js-jankisalvi reviewed Jun 26, 2025
View reviewed changes
.github/CODEOWNERS Outdated
/x-pack/test/api_integration_basic/apis/security_solution/index.ts @elastic/response-ops
/x-pack/test/api_integration_basic/apis/security_solution/cases_privileges.ts @elastic/response-ops
/x-pack/solutions/security/test/api_integration_basic/apis/security_solution/index.ts @elastic/response-ops
/x-pack/solutions/security/test/api_integration_basic/apis/security_solution/cases_privileges.ts @elastic/response-ops
Copy link
Copy Markdown
Contributor

@js-jankisalvi js-jankisalvi Jun 26, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

This should also have @elastic/kibana-cases same as x-pack/test/functional/fixtures/kbn_archiver/cases. They will be the new owners of cases plugin.

Copy link
Copy Markdown
Contributor Author

@dmlemeshko dmlemeshko Jun 26, 2025

Choose a reason for hiding this comment

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

fixed in 5acd019

@dmlemeshko dmlemeshko requested a review from js-jankisalvi June 26, 2025 14:55
@dmlemeshko dmlemeshko merged commit 868a465 into elastic:main Jun 26, 2025
11 checks passed
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jun 26, 2025

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

cc @dmlemeshko

dmlemeshko added a commit to dmlemeshko/kibana that referenced this pull request Jun 27, 2025
@dmlemeshko
[ska] relocate api_integration_basic & defend_workflows_cypress tests (…
5178567 
…elastic#225374)

## Summary

Part of elastic/kibana-team#1503

Before:

```
x-pack/test/
     | - api_integration_basic/
     | - defend_workflows_cypress/
```

After:
```
x-pack/solutions/security/test/
     | - api_integration_basic/
     | - defend_workflows_cypress/
```

---------

Co-authored-by: Cesare de Cal <cesare.decal@elastic.co>
(cherry picked from commit 868a465)

# Conflicts:
#	.buildkite/ftr_security_serverless_configs.yml
#	.buildkite/ftr_security_stateful_configs.yml
#	.github/CODEOWNERS
@dmlemeshko dmlemeshko mentioned this pull request Jun 27, 2025
Merged
@dmlemeshko
Copy link
Copy Markdown
Contributor Author

dmlemeshko commented Jun 27, 2025

💚 All backports created successfully

Status Branch Result
✅ 8.19

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

Questions ?

Please refer to the Backport tool documentation

This was referenced Jul 1, 2025
Merged
Merged
Merged
Merged
Merged
dmlemeshko added a commit to dmlemeshko/kibana that referenced this pull request Jul 7, 2025
@dmlemeshko
[ska] relocate api_integration_basic & defend_workflows_cypress tests (…
340202d 
…elastic#225374)

## Summary

Part of elastic/kibana-team#1503

Before:

```
x-pack/test/
     | - api_integration_basic/
     | - defend_workflows_cypress/
```

After:
```
x-pack/solutions/security/test/
     | - api_integration_basic/
     | - defend_workflows_cypress/
```

---------

Co-authored-by: Cesare de Cal <cesare.decal@elastic.co>
(cherry picked from commit 868a465)

# Conflicts:
#	.buildkite/ftr_security_serverless_configs.yml
#	.buildkite/ftr_security_stateful_configs.yml
#	.github/CODEOWNERS
@dmlemeshko
Copy link
Copy Markdown
Contributor Author

dmlemeshko commented Jul 7, 2025

💚 All backports created successfully

Status Branch Result
✅ 8.19

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

Questions ?

Please refer to the Backport tool documentation

dmlemeshko added a commit that referenced this pull request Jul 8, 2025
@dmlemeshko
[8.19] [ska] relocate api_integration_basic & defend_workflows_cypres…
12ce625 
…s tests (#225374) (#225578)

# Backport

This will backport the following commits from `main` to `8.19`:
- [[ska] relocate api_integration_basic & defend_workflows_cypress tests
(#225374)](#225374)

<!--- Backport version: 10.0.1 -->

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

<!--BACKPORT [{"author":{"name":"Dzmitry
Lemechko","email":"dzmitry.lemechko@elastic.co"},"sourceCommit":{"committedDate":"2025-06-26T16:43:58Z","message":"[ska]
relocate api_integration_basic & defend_workflows_cypress tests
(#225374)\n\n## Summary\n\nPart of
https://github.com/elastic/kibana-team/issues/1503\n\nBefore:\n\n```\nx-pack/test/\n
| - api_integration_basic/\n | -
defend_workflows_cypress/\n```\n\nAfter:
\n```\nx-pack/solutions/security/test/\n | - api_integration_basic/\n |
- defend_workflows_cypress/\n```\n\n---------\n\nCo-authored-by: Cesare
de Cal
<cesare.decal@elastic.co>","sha":"868a4657ee8060f4beb61b14d5db982876b03834","branchLabelMapping":{"^v9.1.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport:skip","v9.1.0","v8.19.0"],"title":"[ska]
relocate api_integration_basic & defend_workflows_cypress
tests","number":225374,"url":"https://github.com/elastic/kibana/pull/225374","mergeCommit":{"message":"[ska]
relocate api_integration_basic & defend_workflows_cypress tests
(#225374)\n\n## Summary\n\nPart of
https://github.com/elastic/kibana-team/issues/1503\n\nBefore:\n\n```\nx-pack/test/\n
| - api_integration_basic/\n | -
defend_workflows_cypress/\n```\n\nAfter:
\n```\nx-pack/solutions/security/test/\n | - api_integration_basic/\n |
- defend_workflows_cypress/\n```\n\n---------\n\nCo-authored-by: Cesare
de Cal
<cesare.decal@elastic.co>","sha":"868a4657ee8060f4beb61b14d5db982876b03834"}},"sourceBranch":"main","suggestedTargetBranches":["8.19"],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/225374","number":225374,"mergeCommit":{"message":"[ska]
relocate api_integration_basic & defend_workflows_cypress tests
(#225374)\n\n## Summary\n\nPart of
https://github.com/elastic/kibana-team/issues/1503\n\nBefore:\n\n```\nx-pack/test/\n
| - api_integration_basic/\n | -
defend_workflows_cypress/\n```\n\nAfter:
\n```\nx-pack/solutions/security/test/\n | - api_integration_basic/\n |
- defend_workflows_cypress/\n```\n\n---------\n\nCo-authored-by: Cesare
de Cal
<cesare.decal@elastic.co>","sha":"868a4657ee8060f4beb61b14d5db982876b03834"}},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jbudz jbudz jbudz approved these changes

@csr csr csr approved these changes

@szwarckonrad szwarckonrad szwarckonrad approved these changes

@js-jankisalvi js-jankisalvi js-jankisalvi approved these changes

@gergoabraham gergoabraham Awaiting requested review from gergoabraham gergoabraham is a code owner automatically assigned from elastic/security-defend-workflows

Assignees

@dmlemeshko dmlemeshko

Labels

backport:skip This PR does not require backporting release_note:skip Skip the PR/issue when compiling release notes v8.19.0 v9.1.0

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@dmlemeshko @elasticmachine @jbudz @csr @szwarckonrad @js-jankisalvi