Skip to content

Conversation

@dmlemeshko
Copy link
Member

@dmlemeshko dmlemeshko commented Aug 11, 2025

Summary

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

This PR is mostly about moving observability FTR/Cypress tests from x-pack/test_serverless/ dir to x-pack/solutions/observability/test

Before

x-pack/test_serverless/
  | - functional/test_suites/observability/
  | - api_integration/test_suites/observability/

After:

x-pack/solutions/observability/test/serverless
  | - functional/
  |  |- test_suites/
  |  |- configs/
  | - api_integration/
     |- test_suites/
     |- configs/

All the tests are run under the renamed FTR configs:
Screenshot 2025-08-11 at 12 08 17

@dmlemeshko dmlemeshko self-assigned this Aug 11, 2025
@dmlemeshko dmlemeshko added v9.2.0 v9.1.1 v8.19.2 release_note:skip Skip the PR/issue when compiling release notes backport:version Backport to applied version labels labels Aug 11, 2025
@dmlemeshko dmlemeshko marked this pull request as ready for review August 11, 2025 12:02
@dmlemeshko dmlemeshko requested review from a team as code owners August 11, 2025 12:02
Copy link
Contributor

@rmyz rmyz left a comment

Choose a reason for hiding this comment

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

infra & services changes LGTM

Copy link
Contributor

@kdelemme kdelemme left a comment

Choose a reason for hiding this comment

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

👍🏻 LGTM

Copy link
Contributor

@achyutjhunjhunwala achyutjhunjhunwala left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@jillguyonnet jillguyonnet left a comment

Choose a reason for hiding this comment

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

Fleet changes LGTM

Copy link
Contributor

@peteharverson peteharverson left a comment

Choose a reason for hiding this comment

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

ML changes LGTM

Copy link
Contributor

@jeramysoucy jeramysoucy left a comment

Choose a reason for hiding this comment

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

AFAICT there were no code changes to Kibana Security-owned files, only 5 moved files. LGTM

@elasticmachine
Copy link
Contributor

elasticmachine commented Aug 13, 2025

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] Scout: [ platform / streams_app ] plugin / stateful - Stream data processing - editing processors - should handle insufficient privileges gracefully
  • [job] [logs] Fleet Cypress Tests #2 / View agents list Agent status filter should filter on healthy and unhealthy
  • [job] [logs] Fleet Cypress Tests #2 / View agents list Bulk actions should allow to bulk upgrade agents and cancel that upgrade

Metrics [docs]

✅ unchanged

History

cc @dmlemeshko

@dmlemeshko dmlemeshko enabled auto-merge (squash) August 13, 2025 09:18
@dmlemeshko dmlemeshko merged commit 996b489 into elastic:main Aug 13, 2025
13 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.19, 9.1

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

@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
8.19 Backport failed because of merge conflicts
9.1 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 231256

Questions ?

Please refer to the Backport tool documentation

dmlemeshko added a commit to dmlemeshko/kibana that referenced this pull request Aug 14, 2025
…ic#231256)

## Summary

Part of elastic/kibana-team#1503

This PR is mostly about moving observability FTR/Cypress tests from
`x-pack/test_serverless/` dir to `x-pack/solutions/observability/test`

Before
```
x-pack/test_serverless/
  | - functional/test_suites/observability/
  | - api_integration/test_suites/observability/
```

After:
```
x-pack/solutions/observability/test/serverless
  | - functional/
  |  |- test_suites/
  |  |- configs/
  | - api_integration/
     |- test_suites/
     |- configs/
```

All the tests are run under the renamed FTR configs:
<img width="1713" height="481" alt="Screenshot 2025-08-11 at 12 08 17"
src="https://github.com/user-attachments/assets/a1588e1a-609d-4c28-a0f8-d442eaa4a1da"
/>

---------

Co-authored-by: kibanamachine <[email protected]>
(cherry picked from commit 996b489)

# Conflicts:
#	.buildkite/ftr_oblt_serverless_configs.yml
#	x-pack/platform/test/tsconfig.json
#	x-pack/solutions/observability/plugins/observability_logs_explorer/README.md
#	x-pack/solutions/observability/test/serverless/api_integration/configs/index.logs_essentials.ts
#	x-pack/solutions/observability/test/serverless/api_integration/test_suites/logs_essentials_only/connector_and_rules.ts
#	x-pack/solutions/observability/test/serverless/api_integration/test_suites/platform_security/authorization.ts
#	x-pack/solutions/observability/test/serverless/api_integration/test_suites/platform_security/index.ts
#	x-pack/solutions/observability/test/serverless/functional/test_suites/cases/index.ts
#	x-pack/solutions/observability/test/serverless/functional/test_suites/discover/embeddables/_get_doc_viewer.ts
#	x-pack/solutions/observability/test/serverless/functional/test_suites/discover/logs/_get_doc_viewer.ts
#	x-pack/solutions/observability/test/serverless/functional/test_suites/landing_page.ts
#	x-pack/solutions/observability/test/serverless/functional/test_suites/logs_essentials_only/privileges.ts
#	x-pack/solutions/observability/test/serverless/functional/test_suites/privileges.ts
#	x-pack/test_serverless/api_integration/services/index.ts
#	x-pack/test_serverless/api_integration/services/synthtrace.ts
#	x-pack/test_serverless/functional/page_objects/index.ts
#	x-pack/test_serverless/functional/test_suites/observability/index.ts
@dmlemeshko
Copy link
Member Author

💚 All backports created successfully

Status Branch Result
9.1

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

Questions ?

Please refer to the Backport tool documentation

fkanout pushed a commit to fkanout/kibana that referenced this pull request Aug 14, 2025
…ic#231256)

## Summary

Part of elastic/kibana-team#1503

This PR is mostly about moving observability FTR/Cypress tests from
`x-pack/test_serverless/` dir to `x-pack/solutions/observability/test`

Before
```
x-pack/test_serverless/
  | - functional/test_suites/observability/
  | - api_integration/test_suites/observability/
```

After: 
```
x-pack/solutions/observability/test/serverless
  | - functional/
  |  |- test_suites/
  |  |- configs/
  | - api_integration/
     |- test_suites/
     |- configs/
```

All the tests are run under the renamed FTR configs:
<img width="1713" height="481" alt="Screenshot 2025-08-11 at 12 08 17"
src="https://github.com/user-attachments/assets/a1588e1a-609d-4c28-a0f8-d442eaa4a1da"
/>

---------

Co-authored-by: kibanamachine <[email protected]>
@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Aug 15, 2025
@kibanamachine
Copy link
Contributor

Looks like this PR has a backport PR but it still hasn't been merged. Please merge it ASAP to keep the branches relatively in sync.
cc: @dmlemeshko

dmlemeshko added a commit that referenced this pull request Aug 15, 2025
…231256) (#231732)

# Backport

This will backport the following commits from `main` to `9.1`:
- [[ska] relocate Observability serverless api & functional tests
(#231256)](#231256)

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

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

<!--BACKPORT [{"author":{"name":"Dzmitry
Lemechko","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-08-13T10:53:44Z","message":"[ska]
relocate Observability serverless api & functional tests (#231256)\n\n##
Summary\n\nPart of
https://github.com/elastic/kibana-team/issues/1503\n\nThis PR is mostly
about moving observability FTR/Cypress tests
from\n`x-pack/test_serverless/` dir to
`x-pack/solutions/observability/test`\n\nBefore\n```\nx-pack/test_serverless/\n
| - functional/test_suites/observability/\n | -
api_integration/test_suites/observability/\n```\n\nAfter:
\n```\nx-pack/solutions/observability/test/serverless\n | -
functional/\n | |- test_suites/\n | |- configs/\n | - api_integration/\n
|- test_suites/\n |- configs/\n```\n\nAll the tests are run under the
renamed FTR configs:\n<img width=\"1713\" height=\"481\"
alt=\"Screenshot 2025-08-11 at 12 08
17\"\nsrc=\"https://github.com/user-attachments/assets/a1588e1a-609d-4c28-a0f8-d442eaa4a1da\"\n/>\n\n---------\n\nCo-authored-by:
kibanamachine
<[email protected]>","sha":"996b489e2d950a34a459baafcddefced2c44debc","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","Team:obs-ux-infra_services","backport:version","v9.2.0","v9.1.1","v8.19.2"],"title":"[ska]
relocate Observability serverless api & functional
tests","number":231256,"url":"https://github.com/elastic/kibana/pull/231256","mergeCommit":{"message":"[ska]
relocate Observability serverless api & functional tests (#231256)\n\n##
Summary\n\nPart of
https://github.com/elastic/kibana-team/issues/1503\n\nThis PR is mostly
about moving observability FTR/Cypress tests
from\n`x-pack/test_serverless/` dir to
`x-pack/solutions/observability/test`\n\nBefore\n```\nx-pack/test_serverless/\n
| - functional/test_suites/observability/\n | -
api_integration/test_suites/observability/\n```\n\nAfter:
\n```\nx-pack/solutions/observability/test/serverless\n | -
functional/\n | |- test_suites/\n | |- configs/\n | - api_integration/\n
|- test_suites/\n |- configs/\n```\n\nAll the tests are run under the
renamed FTR configs:\n<img width=\"1713\" height=\"481\"
alt=\"Screenshot 2025-08-11 at 12 08
17\"\nsrc=\"https://github.com/user-attachments/assets/a1588e1a-609d-4c28-a0f8-d442eaa4a1da\"\n/>\n\n---------\n\nCo-authored-by:
kibanamachine
<[email protected]>","sha":"996b489e2d950a34a459baafcddefced2c44debc"}},"sourceBranch":"main","suggestedTargetBranches":["9.1","8.19"],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/231256","number":231256,"mergeCommit":{"message":"[ska]
relocate Observability serverless api & functional tests (#231256)\n\n##
Summary\n\nPart of
https://github.com/elastic/kibana-team/issues/1503\n\nThis PR is mostly
about moving observability FTR/Cypress tests
from\n`x-pack/test_serverless/` dir to
`x-pack/solutions/observability/test`\n\nBefore\n```\nx-pack/test_serverless/\n
| - functional/test_suites/observability/\n | -
api_integration/test_suites/observability/\n```\n\nAfter:
\n```\nx-pack/solutions/observability/test/serverless\n | -
functional/\n | |- test_suites/\n | |- configs/\n | - api_integration/\n
|- test_suites/\n |- configs/\n```\n\nAll the tests are run under the
renamed FTR configs:\n<img width=\"1713\" height=\"481\"
alt=\"Screenshot 2025-08-11 at 12 08
17\"\nsrc=\"https://github.com/user-attachments/assets/a1588e1a-609d-4c28-a0f8-d442eaa4a1da\"\n/>\n\n---------\n\nCo-authored-by:
kibanamachine
<[email protected]>","sha":"996b489e2d950a34a459baafcddefced2c44debc"}},{"branch":"9.1","label":"v9.1.1","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.2","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

---------

Co-authored-by: kibanamachine <[email protected]>
@kibanamachine kibanamachine added v9.1.3 and removed backport missing Added to PRs automatically when the are determined to be missing a backport. labels Aug 15, 2025
NicholasPeretti pushed a commit to NicholasPeretti/kibana that referenced this pull request Aug 18, 2025
…ic#231256)

## Summary

Part of elastic/kibana-team#1503

This PR is mostly about moving observability FTR/Cypress tests from
`x-pack/test_serverless/` dir to `x-pack/solutions/observability/test`

Before
```
x-pack/test_serverless/
  | - functional/test_suites/observability/
  | - api_integration/test_suites/observability/
```

After: 
```
x-pack/solutions/observability/test/serverless
  | - functional/
  |  |- test_suites/
  |  |- configs/
  | - api_integration/
     |- test_suites/
     |- configs/
```

All the tests are run under the renamed FTR configs:
<img width="1713" height="481" alt="Screenshot 2025-08-11 at 12 08 17"
src="https://github.com/user-attachments/assets/a1588e1a-609d-4c28-a0f8-d442eaa4a1da"
/>

---------

Co-authored-by: kibanamachine <[email protected]>
qn895 pushed a commit to qn895/kibana that referenced this pull request Aug 26, 2025
…ic#231256)

## Summary

Part of elastic/kibana-team#1503

This PR is mostly about moving observability FTR/Cypress tests from
`x-pack/test_serverless/` dir to `x-pack/solutions/observability/test`

Before
```
x-pack/test_serverless/
  | - functional/test_suites/observability/
  | - api_integration/test_suites/observability/
```

After: 
```
x-pack/solutions/observability/test/serverless
  | - functional/
  |  |- test_suites/
  |  |- configs/
  | - api_integration/
     |- test_suites/
     |- configs/
```

All the tests are run under the renamed FTR configs:
<img width="1713" height="481" alt="Screenshot 2025-08-11 at 12 08 17"
src="https://github.com/user-attachments/assets/a1588e1a-609d-4c28-a0f8-d442eaa4a1da"
/>

---------

Co-authored-by: kibanamachine <[email protected]>
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:Fleet Team label for Observability Data Collection Fleet team Team:obs-ux-infra_services Observability Infrastructure & Services User Experience Team v8.19.2 v9.1.1 v9.1.3 v9.2.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.