Skip to content

chore(NA): adds on_merge_fanout#252775

Merged
mistic merged 7 commits into
elastic:mainfrom
mistic:sync-on-merge-with-prs-for-early-setup
Feb 12, 2026
Merged

chore(NA): adds on_merge_fanout#252775
mistic merged 7 commits into
elastic:mainfrom
mistic:sync-on-merge-with-prs-for-early-setup

Conversation

@mistic
Copy link
Copy Markdown
Contributor

@mistic mistic commented Feb 11, 2026

Closes https://github.com/elastic/kibana-operations/issues/416

This PR creates an on_merge_fanout pipeline to simplify the setup and read of the main on_merge pipeline itself. For now everything aside from core jobs and dynamic pickup jobs for FTR and Scout goes into that file.

I've made sure we are using an early upload to the fanout pipeline so timing should be the same while anything inside the on_merge fanout still aways on the same on_merge gates.

Finally this also puts in sync the setup of on_merge after what we added at #252200

@mistic mistic self-assigned this Feb 11, 2026
@mistic mistic added chore Team:Operations Kibana-Operations Team release_note:skip Skip the PR/issue when compiling release notes backport:all-open Backport to all branches that could still receive a release v9.4.0 labels Feb 11, 2026
@elastic elastic deleted a comment from elasticmachine Feb 11, 2026
@mistic
Copy link
Copy Markdown
Contributor Author

mistic commented Feb 11, 2026

Testing the on merge pipeline with those changes at https://buildkite.com/elastic/kibana-on-merge/builds/87833

@mistic mistic marked this pull request as ready for review February 11, 2026 22:19
@mistic mistic requested a review from a team as a code owner February 11, 2026 22:19
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/kibana-operations (Team:Operations)

@elasticmachine
Copy link
Copy Markdown
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] FTR Configs #34 / Reporting Generate CSV from SearchSource validation Searches large amount of data, stops at Max Size Reached

Metrics [docs]

✅ unchanged

cc @mistic

@mistic mistic merged commit 9c57120 into elastic:main Feb 12, 2026
21 checks passed
@kibanamachine
Copy link
Copy Markdown
Contributor

Starting backport for target branches: 8.19, 9.2, 9.3

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

@kibanamachine
Copy link
Copy Markdown
Contributor

💔 All backports failed

Status Branch Result
8.19 Backport failed because of merge conflicts
9.2 Backport failed because of merge conflicts
9.3 Backport failed because of merge conflicts

Manual backport

To create the backport manually run:

node scripts/backport --pr 252775

Questions ?

Please refer to the Backport tool documentation

mistic added a commit to mistic/kibana that referenced this pull request Feb 12, 2026
Closes elastic/kibana-operations#416

This PR creates an `on_merge_fanout` pipeline to simplify the setup and
read of the main on_merge pipeline itself. For now everything aside from
core jobs and dynamic pickup jobs for FTR and Scout goes into that file.

I've made sure we are using an early upload to the fanout pipeline so
timing should be the same while anything inside the on_merge fanout
still aways on the same on_merge gates.

Finally this also puts in sync the setup of on_merge after what we added
at elastic#252200

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 9c57120)

# Conflicts:
#	.buildkite/pipelines/on_merge.yml
#	.buildkite/pipelines/pull_request/base.yml
#	.buildkite/pipelines/pull_request/security_solution/cypress_burn.yml
#	.buildkite/pipelines/pull_request/security_solution/defend_workflows.yml
mistic added a commit to mistic/kibana that referenced this pull request Feb 12, 2026
Closes elastic/kibana-operations#416

This PR creates an `on_merge_fanout` pipeline to simplify the setup and
read of the main on_merge pipeline itself. For now everything aside from
core jobs and dynamic pickup jobs for FTR and Scout goes into that file.

I've made sure we are using an early upload to the fanout pipeline so
timing should be the same while anything inside the on_merge fanout
still aways on the same on_merge gates.

Finally this also puts in sync the setup of on_merge after what we added
at elastic#252200

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 9c57120)

# Conflicts:
#	.buildkite/pipelines/on_merge.yml
#	.buildkite/pipelines/pull_request/security_solution/cypress_burn.yml
#	.buildkite/pipelines/pull_request/security_solution/defend_workflows.yml
mistic added a commit to mistic/kibana that referenced this pull request Feb 12, 2026
Closes elastic/kibana-operations#416

This PR creates an `on_merge_fanout` pipeline to simplify the setup and
read of the main on_merge pipeline itself. For now everything aside from
core jobs and dynamic pickup jobs for FTR and Scout goes into that file.

I've made sure we are using an early upload to the fanout pipeline so
timing should be the same while anything inside the on_merge fanout
still aways on the same on_merge gates.

Finally this also puts in sync the setup of on_merge after what we added
at elastic#252200

---------

Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
(cherry picked from commit 9c57120)

# Conflicts:
#	.buildkite/pipelines/on_merge.yml
#	.buildkite/pipelines/pull_request/security_solution/cypress_burn.yml
#	.buildkite/pipelines/pull_request/security_solution/defend_workflows.yml
@mistic
Copy link
Copy Markdown
Contributor Author

mistic commented Feb 12, 2026

💚 All backports created successfully

Status Branch Result
9.2
8.19

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

Questions ?

Please refer to the Backport tool documentation

mistic added a commit that referenced this pull request Feb 12, 2026
# Backport

This will backport the following commits from `main` to `9.3`:
- [chore(NA): adds on_merge_fanout
(#252775)](#252775)

<!--- Backport version: 10.2.0 -->

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

<!--BACKPORT [{"author":{"name":"Tiago
Costa","email":"tiago.costa@elastic.co"},"sourceCommit":{"committedDate":"2026-02-12T03:39:42Z","message":"chore(NA):
adds on_merge_fanout (#252775)\n\nCloses
https://github.com/elastic/kibana-operations/issues/416\n\nThis PR
creates an `on_merge_fanout` pipeline to simplify the setup and\nread of
the main on_merge pipeline itself. For now everything aside from\ncore
jobs and dynamic pickup jobs for FTR and Scout goes into that
file.\n\nI've made sure we are using an early upload to the fanout
pipeline so\ntiming should be the same while anything inside the
on_merge fanout\nstill aways on the same on_merge gates.\n\nFinally this
also puts in sync the setup of on_merge after what we added\nat
https://github.com/elastic/kibana/pull/252200\n\n---------\n\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"9c57120bf579cac2fab52c218c1698c3b20be501","branchLabelMapping":{"^v9.4.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Operations","release_note:skip","backport:all-open","v9.4.0"],"title":"chore(NA):
adds
on_merge_fanout","number":252775,"url":"https://github.com/elastic/kibana/pull/252775","mergeCommit":{"message":"chore(NA):
adds on_merge_fanout (#252775)\n\nCloses
https://github.com/elastic/kibana-operations/issues/416\n\nThis PR
creates an `on_merge_fanout` pipeline to simplify the setup and\nread of
the main on_merge pipeline itself. For now everything aside from\ncore
jobs and dynamic pickup jobs for FTR and Scout goes into that
file.\n\nI've made sure we are using an early upload to the fanout
pipeline so\ntiming should be the same while anything inside the
on_merge fanout\nstill aways on the same on_merge gates.\n\nFinally this
also puts in sync the setup of on_merge after what we added\nat
https://github.com/elastic/kibana/pull/252200\n\n---------\n\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"9c57120bf579cac2fab52c218c1698c3b20be501"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.4.0","branchLabelMappingKey":"^v9.4.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/252775","number":252775,"mergeCommit":{"message":"chore(NA):
adds on_merge_fanout (#252775)\n\nCloses
https://github.com/elastic/kibana-operations/issues/416\n\nThis PR
creates an `on_merge_fanout` pipeline to simplify the setup and\nread of
the main on_merge pipeline itself. For now everything aside from\ncore
jobs and dynamic pickup jobs for FTR and Scout goes into that
file.\n\nI've made sure we are using an early upload to the fanout
pipeline so\ntiming should be the same while anything inside the
on_merge fanout\nstill aways on the same on_merge gates.\n\nFinally this
also puts in sync the setup of on_merge after what we added\nat
https://github.com/elastic/kibana/pull/252200\n\n---------\n\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"9c57120bf579cac2fab52c218c1698c3b20be501"}}]}]
BACKPORT-->
mistic added a commit that referenced this pull request Feb 12, 2026
# Backport

This will backport the following commits from `main` to `9.2`:
- [chore(NA): adds on_merge_fanout
(#252775)](#252775)

<!--- Backport version: 10.2.0 -->

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

<!--BACKPORT [{"author":{"name":"Tiago
Costa","email":"tiago.costa@elastic.co"},"sourceCommit":{"committedDate":"2026-02-12T03:39:42Z","message":"chore(NA):
adds on_merge_fanout (#252775)\n\nCloses
https://github.com/elastic/kibana-operations/issues/416\n\nThis PR
creates an `on_merge_fanout` pipeline to simplify the setup and\nread of
the main on_merge pipeline itself. For now everything aside from\ncore
jobs and dynamic pickup jobs for FTR and Scout goes into that
file.\n\nI've made sure we are using an early upload to the fanout
pipeline so\ntiming should be the same while anything inside the
on_merge fanout\nstill aways on the same on_merge gates.\n\nFinally this
also puts in sync the setup of on_merge after what we added\nat
https://github.com/elastic/kibana/pull/252200\n\n---------\n\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"9c57120bf579cac2fab52c218c1698c3b20be501","branchLabelMapping":{"^v9.4.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Operations","release_note:skip","backport:all-open","v9.4.0"],"title":"chore(NA):
adds
on_merge_fanout","number":252775,"url":"https://github.com/elastic/kibana/pull/252775","mergeCommit":{"message":"chore(NA):
adds on_merge_fanout (#252775)\n\nCloses
https://github.com/elastic/kibana-operations/issues/416\n\nThis PR
creates an `on_merge_fanout` pipeline to simplify the setup and\nread of
the main on_merge pipeline itself. For now everything aside from\ncore
jobs and dynamic pickup jobs for FTR and Scout goes into that
file.\n\nI've made sure we are using an early upload to the fanout
pipeline so\ntiming should be the same while anything inside the
on_merge fanout\nstill aways on the same on_merge gates.\n\nFinally this
also puts in sync the setup of on_merge after what we added\nat
https://github.com/elastic/kibana/pull/252200\n\n---------\n\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"9c57120bf579cac2fab52c218c1698c3b20be501"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.4.0","branchLabelMappingKey":"^v9.4.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/252775","number":252775,"mergeCommit":{"message":"chore(NA):
adds on_merge_fanout (#252775)\n\nCloses
https://github.com/elastic/kibana-operations/issues/416\n\nThis PR
creates an `on_merge_fanout` pipeline to simplify the setup and\nread of
the main on_merge pipeline itself. For now everything aside from\ncore
jobs and dynamic pickup jobs for FTR and Scout goes into that
file.\n\nI've made sure we are using an early upload to the fanout
pipeline so\ntiming should be the same while anything inside the
on_merge fanout\nstill aways on the same on_merge gates.\n\nFinally this
also puts in sync the setup of on_merge after what we added\nat
https://github.com/elastic/kibana/pull/252200\n\n---------\n\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"9c57120bf579cac2fab52c218c1698c3b20be501"}},{"url":"https://github.com/elastic/kibana/pull/252790","number":252790,"branch":"9.3","state":"OPEN"}]}]
BACKPORT-->
mistic added a commit that referenced this pull request Feb 12, 2026
# Backport

This will backport the following commits from `main` to `8.19`:
- [chore(NA): adds on_merge_fanout
(#252775)](#252775)

<!--- Backport version: 10.2.0 -->

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

<!--BACKPORT [{"author":{"name":"Tiago
Costa","email":"tiago.costa@elastic.co"},"sourceCommit":{"committedDate":"2026-02-12T03:39:42Z","message":"chore(NA):
adds on_merge_fanout (#252775)\n\nCloses
https://github.com/elastic/kibana-operations/issues/416\n\nThis PR
creates an `on_merge_fanout` pipeline to simplify the setup and\nread of
the main on_merge pipeline itself. For now everything aside from\ncore
jobs and dynamic pickup jobs for FTR and Scout goes into that
file.\n\nI've made sure we are using an early upload to the fanout
pipeline so\ntiming should be the same while anything inside the
on_merge fanout\nstill aways on the same on_merge gates.\n\nFinally this
also puts in sync the setup of on_merge after what we added\nat
https://github.com/elastic/kibana/pull/252200\n\n---------\n\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"9c57120bf579cac2fab52c218c1698c3b20be501","branchLabelMapping":{"^v9.4.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["chore","Team:Operations","release_note:skip","backport:all-open","v9.4.0"],"title":"chore(NA):
adds
on_merge_fanout","number":252775,"url":"https://github.com/elastic/kibana/pull/252775","mergeCommit":{"message":"chore(NA):
adds on_merge_fanout (#252775)\n\nCloses
https://github.com/elastic/kibana-operations/issues/416\n\nThis PR
creates an `on_merge_fanout` pipeline to simplify the setup and\nread of
the main on_merge pipeline itself. For now everything aside from\ncore
jobs and dynamic pickup jobs for FTR and Scout goes into that
file.\n\nI've made sure we are using an early upload to the fanout
pipeline so\ntiming should be the same while anything inside the
on_merge fanout\nstill aways on the same on_merge gates.\n\nFinally this
also puts in sync the setup of on_merge after what we added\nat
https://github.com/elastic/kibana/pull/252200\n\n---------\n\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"9c57120bf579cac2fab52c218c1698c3b20be501"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.4.0","branchLabelMappingKey":"^v9.4.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/252775","number":252775,"mergeCommit":{"message":"chore(NA):
adds on_merge_fanout (#252775)\n\nCloses
https://github.com/elastic/kibana-operations/issues/416\n\nThis PR
creates an `on_merge_fanout` pipeline to simplify the setup and\nread of
the main on_merge pipeline itself. For now everything aside from\ncore
jobs and dynamic pickup jobs for FTR and Scout goes into that
file.\n\nI've made sure we are using an early upload to the fanout
pipeline so\ntiming should be the same while anything inside the
on_merge fanout\nstill aways on the same on_merge gates.\n\nFinally this
also puts in sync the setup of on_merge after what we added\nat
https://github.com/elastic/kibana/pull/252200\n\n---------\n\nCo-authored-by:
kibanamachine
<42973632+kibanamachine@users.noreply.github.com>","sha":"9c57120bf579cac2fab52c218c1698c3b20be501"}},{"url":"https://github.com/elastic/kibana/pull/252790","number":252790,"branch":"9.3","state":"OPEN"}]}]
BACKPORT-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport:all-open Backport to all branches that could still receive a release chore release_note:skip Skip the PR/issue when compiling release notes Team:Operations Kibana-Operations Team v8.19.12 v9.2.6 v9.3.0 v9.4.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants