Skip to content

Conversation

@crespocarlos
Copy link
Contributor

@crespocarlos crespocarlos commented Aug 4, 2025

closes 228305
closes 228130

Summary

This PR follows this suggestion #228305 (comment) to use dockerized epm registry environment in CI

@crespocarlos crespocarlos force-pushed the 228305-fix-fleet-dependent-tests branch from ec9de8c to 21819e5 Compare August 4, 2025 12:22
@kibanamachine
Copy link
Contributor

Flaky Test Runner Stats

🎉 All tests passed! - kibana-flaky-test-suite-runner#9001

[✅] x-pack/solutions/observability/test/apm_api_integration/basic/config.ts: 30/30 tests passed.
[✅] x-pack/solutions/observability/test/apm_api_integration/cloud/config.ts: 30/30 tests passed.

see run history

@crespocarlos crespocarlos added v9.0.0 backport:version Backport to applied version labels v8.18.0 v9.1.0 v8.19.0 release_note:skip Skip the PR/issue when compiling release notes labels Aug 4, 2025
@crespocarlos crespocarlos marked this pull request as ready for review August 4, 2025 14:23
@crespocarlos crespocarlos requested a review from a team August 4, 2025 14:23
Copy link
Member

@jennypavlova jennypavlova 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 for adding that!

const kibanaServerUrl = format(kibanaServer);
const esServer = servers.elasticsearch as UrlObject;

const dockerRegistryPort: string | undefined = process.env.FLEET_PACKAGE_REGISTRY_PORT;
Copy link
Member

Choose a reason for hiding this comment

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

Nit: do we need to specify the type, or is the process.env.FLEET_PACKAGE_REGISTRY_PORT is a different type?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It can be undefined, right?

@botelastic botelastic bot added ci:project-deploy-observability Create an Observability project Team:obs-ux-infra_services - DEPRECATED DEPRECATED - Use Team:obs-presentation. labels Aug 5, 2025
@elasticmachine
Copy link
Contributor

Pinging @elastic/obs-ux-infra_services-team (Team:obs-ux-infra_services)

@github-actions
Copy link
Contributor

github-actions bot commented Aug 5, 2025

🤖 GitHub comments

Expand to view the GitHub comments

Just comment with:

  • /oblt-deploy : Deploy a Kibana instance using the Observability test environments.
  • run docs-build : Re-trigger the docs validation. (use unformatted text in the comment!)

@crespocarlos crespocarlos merged commit 1545634 into elastic:main Aug 5, 2025
36 checks passed
@crespocarlos crespocarlos deleted the 228305-fix-fleet-dependent-tests branch August 5, 2025 11:12
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 8.18, 8.19, 9.0, 9.1

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

@kibanamachine
Copy link
Contributor

💔 All backports failed

Status Branch Result
8.18 Backport failed because of merge conflicts
8.19 Backport failed because of merge conflicts
9.0 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 230398

Questions ?

Please refer to the Backport tool documentation

crespocarlos added a commit to crespocarlos/kibana that referenced this pull request Aug 5, 2025
closes [228305](elastic#228305)
closes [228130](elastic#228130)

## Summary

This PR follows this suggestion
elastic#228305 (comment)
to use dockerized epm registry environment in CI

(cherry picked from commit 1545634)

# Conflicts:
#	x-pack/solutions/observability/test/apm_api_integration/common/config.ts
crespocarlos added a commit to crespocarlos/kibana that referenced this pull request Aug 5, 2025
closes [228305](elastic#228305)
closes [228130](elastic#228130)

## Summary

This PR follows this suggestion
elastic#228305 (comment)
to use dockerized epm registry environment in CI

(cherry picked from commit 1545634)

# Conflicts:
#	x-pack/test/apm_api_integration/common/config.ts
#	x-pack/test/apm_api_integration/common/fixtures/package_registry_config.yml
@crespocarlos
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
9.1
9.0
8.19
8.18

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

Questions ?

Please refer to the Backport tool documentation

crespocarlos added a commit to crespocarlos/kibana that referenced this pull request Aug 5, 2025
closes [228305](elastic#228305)
closes [228130](elastic#228130)

## Summary

This PR follows this suggestion
elastic#228305 (comment)
to use dockerized epm registry environment in CI

(cherry picked from commit 1545634)

# Conflicts:
#	x-pack/solutions/observability/test/apm_api_integration/common/config.ts
crespocarlos added a commit to crespocarlos/kibana that referenced this pull request Aug 5, 2025
closes [228305](elastic#228305)
closes [228130](elastic#228130)

## Summary

This PR follows this suggestion
elastic#228305 (comment)
to use dockerized epm registry environment in CI

(cherry picked from commit 1545634)

# Conflicts:
#	x-pack/test/apm_api_integration/common/config.ts
#	x-pack/test/apm_api_integration/common/fixtures/package_registry_config.yml
delanni pushed a commit to delanni/kibana that referenced this pull request Aug 5, 2025
closes [228305](elastic#228305)
closes [228130](elastic#228130)

## Summary

This PR follows this suggestion
elastic#228305 (comment)
to use dockerized epm registry environment in CI
crespocarlos added a commit that referenced this pull request Aug 6, 2025
…230635)

# Backport

This will backport the following commits from `main` to `9.1`:
- [[APM] Configure fleet docker container for APM tests
(#230398)](#230398)

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

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

<!--BACKPORT [{"author":{"name":"Carlos
Crespo","email":"crespocarlos@users.noreply.github.com"},"sourceCommit":{"committedDate":"2025-08-05T11:12:35Z","message":"[APM]
Configure fleet docker container for APM tests (#230398)\n\ncloses
[228305](https://github.com/elastic/kibana/issues/228305)\ncloses
[228130](https://github.com/elastic/kibana/issues/228130)\n\n##
Summary\n\nThis PR follows this
suggestion\nhttps://github.com//issues/228305#issuecomment-3103601583\nto
use dockerized epm registry environment in
CI","sha":"15456349ea853b8eebae28e23f4cfc1f48088375","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","ci:project-deploy-observability","Team:obs-ux-infra_services","backport:version","v8.18.0","v9.1.0","v8.19.0","v9.2.0"],"title":"[APM]
Configure fleet docker container for APM
tests","number":230398,"url":"https://github.com/elastic/kibana/pull/230398","mergeCommit":{"message":"[APM]
Configure fleet docker container for APM tests (#230398)\n\ncloses
[228305](https://github.com/elastic/kibana/issues/228305)\ncloses
[228130](https://github.com/elastic/kibana/issues/228130)\n\n##
Summary\n\nThis PR follows this
suggestion\nhttps://github.com//issues/228305#issuecomment-3103601583\nto
use dockerized epm registry environment in
CI","sha":"15456349ea853b8eebae28e23f4cfc1f48088375"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.18","9.1","8.19"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.1","label":"v9.1.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/230398","number":230398,"mergeCommit":{"message":"[APM]
Configure fleet docker container for APM tests (#230398)\n\ncloses
[228305](https://github.com/elastic/kibana/issues/228305)\ncloses
[228130](https://github.com/elastic/kibana/issues/228130)\n\n##
Summary\n\nThis PR follows this
suggestion\nhttps://github.com//issues/228305#issuecomment-3103601583\nto
use dockerized epm registry environment in
CI","sha":"15456349ea853b8eebae28e23f4cfc1f48088375"}}]}] BACKPORT-->
crespocarlos added a commit that referenced this pull request Aug 6, 2025
…230637)

# Backport

This will backport the following commits from `main` to `9.0`:
- [[APM] Configure fleet docker container for APM tests
(#230398)](#230398)

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

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

<!--BACKPORT [{"author":{"name":"Carlos
Crespo","email":"crespocarlos@users.noreply.github.com"},"sourceCommit":{"committedDate":"2025-08-05T11:12:35Z","message":"[APM]
Configure fleet docker container for APM tests (#230398)\n\ncloses
[228305](https://github.com/elastic/kibana/issues/228305)\ncloses
[228130](https://github.com/elastic/kibana/issues/228130)\n\n##
Summary\n\nThis PR follows this
suggestion\nhttps://github.com//issues/228305#issuecomment-3103601583\nto
use dockerized epm registry environment in
CI","sha":"15456349ea853b8eebae28e23f4cfc1f48088375","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","ci:project-deploy-observability","Team:obs-ux-infra_services","backport:version","v8.18.0","v9.1.0","v8.19.0","v9.2.0"],"title":"[APM]
Configure fleet docker container for APM
tests","number":230398,"url":"https://github.com/elastic/kibana/pull/230398","mergeCommit":{"message":"[APM]
Configure fleet docker container for APM tests (#230398)\n\ncloses
[228305](https://github.com/elastic/kibana/issues/228305)\ncloses
[228130](https://github.com/elastic/kibana/issues/228130)\n\n##
Summary\n\nThis PR follows this
suggestion\nhttps://github.com//issues/228305#issuecomment-3103601583\nto
use dockerized epm registry environment in
CI","sha":"15456349ea853b8eebae28e23f4cfc1f48088375"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.18","9.1","8.19"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.1","label":"v9.1.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/230398","number":230398,"mergeCommit":{"message":"[APM]
Configure fleet docker container for APM tests (#230398)\n\ncloses
[228305](https://github.com/elastic/kibana/issues/228305)\ncloses
[228130](https://github.com/elastic/kibana/issues/228130)\n\n##
Summary\n\nThis PR follows this
suggestion\nhttps://github.com//issues/228305#issuecomment-3103601583\nto
use dockerized epm registry environment in
CI","sha":"15456349ea853b8eebae28e23f4cfc1f48088375"}}]}] BACKPORT-->
crespocarlos added a commit that referenced this pull request Aug 6, 2025
…#230638)

# Backport

This will backport the following commits from `main` to `8.19`:
- [[APM] Configure fleet docker container for APM tests
(#230398)](#230398)

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

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

<!--BACKPORT [{"author":{"name":"Carlos
Crespo","email":"crespocarlos@users.noreply.github.com"},"sourceCommit":{"committedDate":"2025-08-05T11:12:35Z","message":"[APM]
Configure fleet docker container for APM tests (#230398)\n\ncloses
[228305](https://github.com/elastic/kibana/issues/228305)\ncloses
[228130](https://github.com/elastic/kibana/issues/228130)\n\n##
Summary\n\nThis PR follows this
suggestion\nhttps://github.com//issues/228305#issuecomment-3103601583\nto
use dockerized epm registry environment in
CI","sha":"15456349ea853b8eebae28e23f4cfc1f48088375","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","ci:project-deploy-observability","Team:obs-ux-infra_services","backport:version","v8.18.0","v9.1.0","v8.19.0","v9.2.0"],"title":"[APM]
Configure fleet docker container for APM
tests","number":230398,"url":"https://github.com/elastic/kibana/pull/230398","mergeCommit":{"message":"[APM]
Configure fleet docker container for APM tests (#230398)\n\ncloses
[228305](https://github.com/elastic/kibana/issues/228305)\ncloses
[228130](https://github.com/elastic/kibana/issues/228130)\n\n##
Summary\n\nThis PR follows this
suggestion\nhttps://github.com//issues/228305#issuecomment-3103601583\nto
use dockerized epm registry environment in
CI","sha":"15456349ea853b8eebae28e23f4cfc1f48088375"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.18","9.1","8.19"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.1","label":"v9.1.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/230398","number":230398,"mergeCommit":{"message":"[APM]
Configure fleet docker container for APM tests (#230398)\n\ncloses
[228305](https://github.com/elastic/kibana/issues/228305)\ncloses
[228130](https://github.com/elastic/kibana/issues/228130)\n\n##
Summary\n\nThis PR follows this
suggestion\nhttps://github.com//issues/228305#issuecomment-3103601583\nto
use dockerized epm registry environment in
CI","sha":"15456349ea853b8eebae28e23f4cfc1f48088375"}}]}] BACKPORT-->
crespocarlos added a commit that referenced this pull request Aug 6, 2025
…#230639)

# Backport

This will backport the following commits from `main` to `8.18`:
- [[APM] Configure fleet docker container for APM tests
(#230398)](#230398)

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

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

<!--BACKPORT [{"author":{"name":"Carlos
Crespo","email":"crespocarlos@users.noreply.github.com"},"sourceCommit":{"committedDate":"2025-08-05T11:12:35Z","message":"[APM]
Configure fleet docker container for APM tests (#230398)\n\ncloses
[228305](https://github.com/elastic/kibana/issues/228305)\ncloses
[228130](https://github.com/elastic/kibana/issues/228130)\n\n##
Summary\n\nThis PR follows this
suggestion\nhttps://github.com//issues/228305#issuecomment-3103601583\nto
use dockerized epm registry environment in
CI","sha":"15456349ea853b8eebae28e23f4cfc1f48088375","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","ci:project-deploy-observability","Team:obs-ux-infra_services","backport:version","v8.18.0","v9.1.0","v8.19.0","v9.2.0"],"title":"[APM]
Configure fleet docker container for APM
tests","number":230398,"url":"https://github.com/elastic/kibana/pull/230398","mergeCommit":{"message":"[APM]
Configure fleet docker container for APM tests (#230398)\n\ncloses
[228305](https://github.com/elastic/kibana/issues/228305)\ncloses
[228130](https://github.com/elastic/kibana/issues/228130)\n\n##
Summary\n\nThis PR follows this
suggestion\nhttps://github.com//issues/228305#issuecomment-3103601583\nto
use dockerized epm registry environment in
CI","sha":"15456349ea853b8eebae28e23f4cfc1f48088375"}},"sourceBranch":"main","suggestedTargetBranches":["9.0","8.18","9.1","8.19"],"targetPullRequestStates":[{"branch":"9.0","label":"v9.0.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.18","label":"v8.18.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"9.1","label":"v9.1.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"8.19","label":"v8.19.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/230398","number":230398,"mergeCommit":{"message":"[APM]
Configure fleet docker container for APM tests (#230398)\n\ncloses
[228305](https://github.com/elastic/kibana/issues/228305)\ncloses
[228130](https://github.com/elastic/kibana/issues/228130)\n\n##
Summary\n\nThis PR follows this
suggestion\nhttps://github.com//issues/228305#issuecomment-3103601583\nto
use dockerized epm registry environment in
CI","sha":"15456349ea853b8eebae28e23f4cfc1f48088375"}}]}] BACKPORT-->

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@wildemat wildemat mentioned this pull request Aug 7, 2025
10 tasks
NicholasPeretti pushed a commit to NicholasPeretti/kibana that referenced this pull request Aug 18, 2025
closes [228305](elastic#228305)
closes [228130](elastic#228130)

## Summary

This PR follows this suggestion
elastic#228305 (comment)
to use dockerized epm registry environment in CI
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment