Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[codeowners] Filter kibanamachine #199404

Merged
merged 6 commits into from
Nov 12, 2024

Conversation

jbudz
Copy link
Member

@jbudz jbudz commented Nov 8, 2024

Currently we remove CODEOWNERS on backport branches to avoid review assignments: reviews were already collected on the source pull request. If there's a conflict, it will go through another round of review but not require all the original assignees.

We want to re-add the file for our own tooling, and to avoid CODEOWNERS merge conflicts on backports. To do this, we're going to add a global override to code assignments on backport branches.

This updates our CODEOWNERS libraries to ignore assignments to kibanamachine.

@jbudz jbudz added Team:Operations Team label for 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 labels Nov 8, 2024
@jbudz jbudz marked this pull request as ready for review November 8, 2024 21:24
@jbudz jbudz requested review from a team as code owners November 8, 2024 21:24
@elasticmachine
Copy link
Contributor

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

Copy link
Member

@dmlemeshko dmlemeshko left a comment

Choose a reason for hiding this comment

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

LGTM

@elasticmachine
Copy link
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

@jbudz jbudz merged commit a26f5d8 into elastic:main Nov 12, 2024
23 checks passed
@kibanamachine
Copy link
Contributor

Starting backport for target branches: 7.17, 8.15, 8.16, 8.x

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

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Nov 12, 2024
Currently we remove CODEOWNERS on backport branches to avoid review
assignments: reviews were already collected on the source pull request.
If there's a conflict, it will go through another round of review but
not require all the original assignees.

We want to re-add the file for our own tooling, and to avoid CODEOWNERS
merge conflicts on backports. To do this, we're going to add a global
override to code assignments on backport branches.

This updates our CODEOWNERS libraries to ignore assignments to
`kibanamachine`.

---------

Co-authored-by: Dzmitry Lemechko <[email protected]>
(cherry picked from commit a26f5d8)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Nov 12, 2024
Currently we remove CODEOWNERS on backport branches to avoid review
assignments: reviews were already collected on the source pull request.
If there's a conflict, it will go through another round of review but
not require all the original assignees.

We want to re-add the file for our own tooling, and to avoid CODEOWNERS
merge conflicts on backports. To do this, we're going to add a global
override to code assignments on backport branches.

This updates our CODEOWNERS libraries to ignore assignments to
`kibanamachine`.

---------

Co-authored-by: Dzmitry Lemechko <[email protected]>
(cherry picked from commit a26f5d8)
kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Nov 12, 2024
Currently we remove CODEOWNERS on backport branches to avoid review
assignments: reviews were already collected on the source pull request.
If there's a conflict, it will go through another round of review but
not require all the original assignees.

We want to re-add the file for our own tooling, and to avoid CODEOWNERS
merge conflicts on backports. To do this, we're going to add a global
override to code assignments on backport branches.

This updates our CODEOWNERS libraries to ignore assignments to
`kibanamachine`.

---------

Co-authored-by: Dzmitry Lemechko <[email protected]>
(cherry picked from commit a26f5d8)
@kibanamachine
Copy link
Contributor

💔 Some backports could not be created

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

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

Manual backport

To create the backport manually run:

node scripts/backport --pr 199404

Questions ?

Please refer to the Backport tool documentation

@jbudz
Copy link
Member Author

jbudz commented Nov 12, 2024

Nothing to backport on 7.17

kibanamachine added a commit that referenced this pull request Nov 12, 2024
# Backport

This will backport the following commits from `main` to `8.15`:
- [[codeowners] Filter kibanamachine
(#199404)](#199404)

<!--- Backport version: 9.4.3 -->

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

<!--BACKPORT
[{"author":{"name":"Jon","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-12T18:39:17Z","message":"[codeowners]
Filter kibanamachine (#199404)\n\nCurrently we remove CODEOWNERS on
backport branches to avoid review\r\nassignments: reviews were already
collected on the source pull request.\r\nIf there's a conflict, it will
go through another round of review but\r\nnot require all the original
assignees.\r\n\r\nWe want to re-add the file for our own tooling, and to
avoid CODEOWNERS\r\nmerge conflicts on backports. To do this, we're
going to add a global\r\noverride to code assignments on backport
branches.\r\n\r\nThis updates our CODEOWNERS libraries to ignore
assignments
to\r\n`kibanamachine`.\r\n\r\n---------\r\n\r\nCo-authored-by: Dzmitry
Lemechko
<[email protected]>","sha":"a26f5d8b61b19aeeae741a7f750257e692edd430","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:skip","v9.0.0","backport:all-open"],"title":"[codeowners]
Filter
kibanamachine","number":199404,"url":"https://github.com/elastic/kibana/pull/199404","mergeCommit":{"message":"[codeowners]
Filter kibanamachine (#199404)\n\nCurrently we remove CODEOWNERS on
backport branches to avoid review\r\nassignments: reviews were already
collected on the source pull request.\r\nIf there's a conflict, it will
go through another round of review but\r\nnot require all the original
assignees.\r\n\r\nWe want to re-add the file for our own tooling, and to
avoid CODEOWNERS\r\nmerge conflicts on backports. To do this, we're
going to add a global\r\noverride to code assignments on backport
branches.\r\n\r\nThis updates our CODEOWNERS libraries to ignore
assignments
to\r\n`kibanamachine`.\r\n\r\n---------\r\n\r\nCo-authored-by: Dzmitry
Lemechko
<[email protected]>","sha":"a26f5d8b61b19aeeae741a7f750257e692edd430"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/199404","number":199404,"mergeCommit":{"message":"[codeowners]
Filter kibanamachine (#199404)\n\nCurrently we remove CODEOWNERS on
backport branches to avoid review\r\nassignments: reviews were already
collected on the source pull request.\r\nIf there's a conflict, it will
go through another round of review but\r\nnot require all the original
assignees.\r\n\r\nWe want to re-add the file for our own tooling, and to
avoid CODEOWNERS\r\nmerge conflicts on backports. To do this, we're
going to add a global\r\noverride to code assignments on backport
branches.\r\n\r\nThis updates our CODEOWNERS libraries to ignore
assignments
to\r\n`kibanamachine`.\r\n\r\n---------\r\n\r\nCo-authored-by: Dzmitry
Lemechko
<[email protected]>","sha":"a26f5d8b61b19aeeae741a7f750257e692edd430"}}]}]
BACKPORT-->

Co-authored-by: Jon <[email protected]>
kibanamachine added a commit that referenced this pull request Nov 12, 2024
# Backport

This will backport the following commits from `main` to `8.16`:
- [[codeowners] Filter kibanamachine
(#199404)](#199404)

<!--- Backport version: 9.4.3 -->

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

<!--BACKPORT
[{"author":{"name":"Jon","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-12T18:39:17Z","message":"[codeowners]
Filter kibanamachine (#199404)\n\nCurrently we remove CODEOWNERS on
backport branches to avoid review\r\nassignments: reviews were already
collected on the source pull request.\r\nIf there's a conflict, it will
go through another round of review but\r\nnot require all the original
assignees.\r\n\r\nWe want to re-add the file for our own tooling, and to
avoid CODEOWNERS\r\nmerge conflicts on backports. To do this, we're
going to add a global\r\noverride to code assignments on backport
branches.\r\n\r\nThis updates our CODEOWNERS libraries to ignore
assignments
to\r\n`kibanamachine`.\r\n\r\n---------\r\n\r\nCo-authored-by: Dzmitry
Lemechko
<[email protected]>","sha":"a26f5d8b61b19aeeae741a7f750257e692edd430","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:skip","v9.0.0","backport:all-open"],"title":"[codeowners]
Filter
kibanamachine","number":199404,"url":"https://github.com/elastic/kibana/pull/199404","mergeCommit":{"message":"[codeowners]
Filter kibanamachine (#199404)\n\nCurrently we remove CODEOWNERS on
backport branches to avoid review\r\nassignments: reviews were already
collected on the source pull request.\r\nIf there's a conflict, it will
go through another round of review but\r\nnot require all the original
assignees.\r\n\r\nWe want to re-add the file for our own tooling, and to
avoid CODEOWNERS\r\nmerge conflicts on backports. To do this, we're
going to add a global\r\noverride to code assignments on backport
branches.\r\n\r\nThis updates our CODEOWNERS libraries to ignore
assignments
to\r\n`kibanamachine`.\r\n\r\n---------\r\n\r\nCo-authored-by: Dzmitry
Lemechko
<[email protected]>","sha":"a26f5d8b61b19aeeae741a7f750257e692edd430"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/199404","number":199404,"mergeCommit":{"message":"[codeowners]
Filter kibanamachine (#199404)\n\nCurrently we remove CODEOWNERS on
backport branches to avoid review\r\nassignments: reviews were already
collected on the source pull request.\r\nIf there's a conflict, it will
go through another round of review but\r\nnot require all the original
assignees.\r\n\r\nWe want to re-add the file for our own tooling, and to
avoid CODEOWNERS\r\nmerge conflicts on backports. To do this, we're
going to add a global\r\noverride to code assignments on backport
branches.\r\n\r\nThis updates our CODEOWNERS libraries to ignore
assignments
to\r\n`kibanamachine`.\r\n\r\n---------\r\n\r\nCo-authored-by: Dzmitry
Lemechko
<[email protected]>","sha":"a26f5d8b61b19aeeae741a7f750257e692edd430"}}]}]
BACKPORT-->

Co-authored-by: Jon <[email protected]>
kibanamachine added a commit that referenced this pull request Nov 12, 2024
# Backport

This will backport the following commits from `main` to `8.x`:
- [[codeowners] Filter kibanamachine
(#199404)](#199404)

<!--- Backport version: 9.4.3 -->

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

<!--BACKPORT
[{"author":{"name":"Jon","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-11-12T18:39:17Z","message":"[codeowners]
Filter kibanamachine (#199404)\n\nCurrently we remove CODEOWNERS on
backport branches to avoid review\r\nassignments: reviews were already
collected on the source pull request.\r\nIf there's a conflict, it will
go through another round of review but\r\nnot require all the original
assignees.\r\n\r\nWe want to re-add the file for our own tooling, and to
avoid CODEOWNERS\r\nmerge conflicts on backports. To do this, we're
going to add a global\r\noverride to code assignments on backport
branches.\r\n\r\nThis updates our CODEOWNERS libraries to ignore
assignments
to\r\n`kibanamachine`.\r\n\r\n---------\r\n\r\nCo-authored-by: Dzmitry
Lemechko
<[email protected]>","sha":"a26f5d8b61b19aeeae741a7f750257e692edd430","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Operations","release_note:skip","v9.0.0","backport:all-open"],"title":"[codeowners]
Filter
kibanamachine","number":199404,"url":"https://github.com/elastic/kibana/pull/199404","mergeCommit":{"message":"[codeowners]
Filter kibanamachine (#199404)\n\nCurrently we remove CODEOWNERS on
backport branches to avoid review\r\nassignments: reviews were already
collected on the source pull request.\r\nIf there's a conflict, it will
go through another round of review but\r\nnot require all the original
assignees.\r\n\r\nWe want to re-add the file for our own tooling, and to
avoid CODEOWNERS\r\nmerge conflicts on backports. To do this, we're
going to add a global\r\noverride to code assignments on backport
branches.\r\n\r\nThis updates our CODEOWNERS libraries to ignore
assignments
to\r\n`kibanamachine`.\r\n\r\n---------\r\n\r\nCo-authored-by: Dzmitry
Lemechko
<[email protected]>","sha":"a26f5d8b61b19aeeae741a7f750257e692edd430"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/199404","number":199404,"mergeCommit":{"message":"[codeowners]
Filter kibanamachine (#199404)\n\nCurrently we remove CODEOWNERS on
backport branches to avoid review\r\nassignments: reviews were already
collected on the source pull request.\r\nIf there's a conflict, it will
go through another round of review but\r\nnot require all the original
assignees.\r\n\r\nWe want to re-add the file for our own tooling, and to
avoid CODEOWNERS\r\nmerge conflicts on backports. To do this, we're
going to add a global\r\noverride to code assignments on backport
branches.\r\n\r\nThis updates our CODEOWNERS libraries to ignore
assignments
to\r\n`kibanamachine`.\r\n\r\n---------\r\n\r\nCo-authored-by: Dzmitry
Lemechko
<[email protected]>","sha":"a26f5d8b61b19aeeae741a7f750257e692edd430"}}]}]
BACKPORT-->

Co-authored-by: Jon <[email protected]>
CAWilson94 pushed a commit to CAWilson94/kibana that referenced this pull request Nov 18, 2024
Currently we remove CODEOWNERS on backport branches to avoid review
assignments: reviews were already collected on the source pull request.
If there's a conflict, it will go through another round of review but
not require all the original assignees.

We want to re-add the file for our own tooling, and to avoid CODEOWNERS
merge conflicts on backports. To do this, we're going to add a global
override to code assignments on backport branches.

This updates our CODEOWNERS libraries to ignore assignments to
`kibanamachine`.

---------

Co-authored-by: Dzmitry Lemechko <[email protected]>
CAWilson94 pushed a commit to CAWilson94/kibana that referenced this pull request Nov 18, 2024
Currently we remove CODEOWNERS on backport branches to avoid review
assignments: reviews were already collected on the source pull request.
If there's a conflict, it will go through another round of review but
not require all the original assignees.

We want to re-add the file for our own tooling, and to avoid CODEOWNERS
merge conflicts on backports. To do this, we're going to add a global
override to code assignments on backport branches.

This updates our CODEOWNERS libraries to ignore assignments to
`kibanamachine`.

---------

Co-authored-by: Dzmitry Lemechko <[email protected]>
jbudz added a commit that referenced this pull request Nov 25, 2024
Restores CODEOWNERS from
307143b

Adds a global assignment override to kibanamachine.

Depends on #199404
jbudz added a commit that referenced this pull request Nov 26, 2024
Restores CODEOWNERS from
df228d4

Adds a global assignment override to kibanamachine.

Depends on #199404
jbudz added a commit that referenced this pull request Nov 26, 2024
Restores the most recent available CODEOWNERS from
c84d92d.

Adds a global assignment override to kibanamachine.

Depends on #199404

---------

Co-authored-by: kibanamachine <[email protected]>
jbudz added a commit that referenced this pull request Nov 26, 2024
Restores CODEOWNERS from
6298032

Adds a global assignment override to kibanamachine.

Depends on #199404
jbudz added a commit that referenced this pull request Nov 27, 2024
Restores the most recent available CODEOWNERS from
c84d92d.

Adds a global assignment override to kibanamachine.

Depends on #199404
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 release_note:skip Skip the PR/issue when compiling release notes Team:Operations Team label for Operations Team v8.15.4 v8.16.0 v8.17.0 v9.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants