Skip to content

[ftr] split feature controls tests into v1/v2 configs#217458

Merged
dmlemeshko merged 4 commits intoelastic:mainfrom
dmlemeshko:ftr/split-saved_query_management-config
Apr 8, 2025
Merged

[ftr] split feature controls tests into v1/v2 configs#217458
dmlemeshko merged 4 commits intoelastic:mainfrom
dmlemeshko:ftr/split-saved_query_management-config

Conversation

@dmlemeshko
Copy link
Contributor

@dmlemeshko dmlemeshko commented Apr 8, 2025

Summary

Splitting long running config: x-pack/test/functional/apps/saved_query_management/config.ts ~57 min into

  • x-pack/test/functional/apps/saved_query_management/config.ts 35m
  • x-pack/test/functional/apps/saved_query_management/config.v2.ts 25m 17s

ideally we need to split both even more, but I will leave it for the later (probably Data-Discovery Team have some ideas how to re-org it?)

@dmlemeshko dmlemeshko self-assigned this Apr 8, 2025
@dmlemeshko dmlemeshko added FTR v9.1.0 v8.19.0 v9.0.1 release_note:skip Skip the PR/issue when compiling release notes backport:version Backport to applied version labels labels Apr 8, 2025
@dmlemeshko dmlemeshko marked this pull request as ready for review April 8, 2025 13:28
@dmlemeshko dmlemeshko requested review from a team as code owners April 8, 2025 13:28
@dmlemeshko dmlemeshko enabled auto-merge (squash) April 8, 2025 17:56
@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #29 / alerting api integration security and spaces enabled - Group 2 Alerting and Actions Telemetry test telemetry should retrieve telemetry data in the expected format

Metrics [docs]

✅ unchanged

History

cc @dmlemeshko

Copy link
Contributor

@davismcphee davismcphee left a comment

Choose a reason for hiding this comment

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

LGTM, thanks 👍 If we wanted to break it down further, we could do it by app instead, but I think by version like you have here makes sense too.

@dmlemeshko dmlemeshko merged commit a234f36 into elastic:main Apr 8, 2025
10 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.x, 9.0

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

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Apr 8, 2025
## Summary

Splitting long running config:
`x-pack/test/functional/apps/saved_query_management/config.ts` **~57
min** into

  - x-pack/test/functional/apps/saved_query_management/config.ts 35m
- x-pack/test/functional/apps/saved_query_management/config.v2.ts 25m
17s

ideally we need to split both even more, but I will leave it for the
later (probably Data-Discovery Team have some ideas how to re-org it?)

(cherry picked from commit a234f36)
@kibanamachine
Copy link
Contributor

💔 Some backports could not be created

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

You might need to backport the following PRs to 8.x:
- [ftr] split oblt DA configs to speedup CI (#217452)
- 🌊 Refactor API control flow for stream management (#211696)
- Added DisabledAuthz utility (#216633)
- Update dependency @types/semver to ^7.7.0 (main) (#216932)
9.0

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

Manual backport

To create the backport manually run:

node scripts/backport --pr 217458

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Apr 8, 2025
…#217593)

# Backport

This will backport the following commits from `main` to `9.0`:
- [[ftr] split feature controls tests into v1/v2 configs
(#217458)](#217458)

<!--- Backport version: 9.6.6 -->

### 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-04-08T22:01:06Z","message":"[ftr]
split feature controls tests into v1/v2 configs (#217458)\n\n##
Summary\n\nSplitting long running
config:\n`x-pack/test/functional/apps/saved_query_management/config.ts`
**~57\nmin** into\n\n -
x-pack/test/functional/apps/saved_query_management/config.ts 35m \n-
x-pack/test/functional/apps/saved_query_management/config.v2.ts
25m\n17s\n\nideally we need to split both even more, but I will leave it
for the\nlater (probably Data-Discovery Team have some ideas how to
re-org
it?)","sha":"a234f3646c8076f7b285ebba589e2ccf4fc45c54","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","FTR","backport:version","v9.1.0","v8.19.0","v9.0.1"],"title":"[ftr]
split feature controls tests into v1/v2
configs","number":217458,"url":"https://github.com/elastic/kibana/pull/217458","mergeCommit":{"message":"[ftr]
split feature controls tests into v1/v2 configs (#217458)\n\n##
Summary\n\nSplitting long running
config:\n`x-pack/test/functional/apps/saved_query_management/config.ts`
**~57\nmin** into\n\n -
x-pack/test/functional/apps/saved_query_management/config.ts 35m \n-
x-pack/test/functional/apps/saved_query_management/config.v2.ts
25m\n17s\n\nideally we need to split both even more, but I will leave it
for the\nlater (probably Data-Discovery Team have some ideas how to
re-org
it?)","sha":"a234f3646c8076f7b285ebba589e2ccf4fc45c54"}},"sourceBranch":"main","suggestedTargetBranches":["8.x","9.0"],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/217458","number":217458,"mergeCommit":{"message":"[ftr]
split feature controls tests into v1/v2 configs (#217458)\n\n##
Summary\n\nSplitting long running
config:\n`x-pack/test/functional/apps/saved_query_management/config.ts`
**~57\nmin** into\n\n -
x-pack/test/functional/apps/saved_query_management/config.ts 35m \n-
x-pack/test/functional/apps/saved_query_management/config.v2.ts
25m\n17s\n\nideally we need to split both even more, but I will leave it
for the\nlater (probably Data-Discovery Team have some ideas how to
re-org
it?)","sha":"a234f3646c8076f7b285ebba589e2ccf4fc45c54"}},{"branch":"8.x","label":"v8.19.0","branchLabelMappingKey":"^v8.19.0$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.0","label":"v9.0.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Dzmitry Lemechko <dzmitry.lemechko@elastic.co>
dmlemeshko added a commit to dmlemeshko/kibana that referenced this pull request Apr 9, 2025
## Summary

Splitting long running config:
`x-pack/test/functional/apps/saved_query_management/config.ts` **~57
min** into

  - x-pack/test/functional/apps/saved_query_management/config.ts 35m
- x-pack/test/functional/apps/saved_query_management/config.v2.ts 25m
17s

ideally we need to split both even more, but I will leave it for the
later (probably Data-Discovery Team have some ideas how to re-org it?)

(cherry picked from commit a234f36)

# Conflicts:
#	x-pack/test/functional/apps/saved_query_management/feature_controls/security.ts
@dmlemeshko
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
8.x

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

Questions ?

Please refer to the Backport tool documentation

@mistic mistic removed the v9.0.1 label Apr 15, 2025
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 FTR release_note:skip Skip the PR/issue when compiling release notes v8.19.0 v9.0.0 v9.1.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants