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

[UII] Adjust test based on ES version tested against #195508

Merged
merged 1 commit into from
Oct 9, 2024

Conversation

jen-huang
Copy link
Contributor

@jen-huang jen-huang commented Oct 8, 2024

Summary

Follow up to #194764. This test was also failing on 7.17 branch when they 8.x ES compatibility tests were run, so this PR adjusts the test based on the ES version it runs against. This will be backported to 8.x and 7.17.

@jen-huang jen-huang added release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team backport:all-open Backport to all branches that could still receive a release labels Oct 8, 2024
@jen-huang jen-huang self-assigned this Oct 8, 2024
@jen-huang jen-huang requested a review from a team as a code owner October 8, 2024 21:14
@elasticmachine
Copy link
Contributor

Pinging @elastic/fleet (Team:Fleet)

@jen-huang jen-huang enabled auto-merge (squash) October 8, 2024 21:14
@elasticmachine
Copy link
Contributor

💛 Build succeeded, but was flaky

Failed CI Steps

Test Failures

  • [job] [logs] Jest Tests #15 / StepConfigurePackage should show nothing to configure if no matching integration

Metrics [docs]

✅ unchanged

cc @jen-huang

Copy link
Member

@nchaulet nchaulet left a comment

Choose a reason for hiding this comment

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

🚀

@jen-huang jen-huang merged commit ab2d7aa into elastic:main Oct 9, 2024
29 checks passed
@kibanamachine
Copy link
Contributor

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

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

kibanamachine pushed a commit to kibanamachine/kibana that referenced this pull request Oct 9, 2024
## Summary

Follow up to elastic#194764. This test was also failing on 7.17 branch when
they 8.x ES compatibility tests were run, so this PR adjusts the test
based on the ES version it runs against. This will be backported to 8.x
and 7.17.

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

💔 Some backports could not be created

Status Branch Result
7.17 Backport failed because of merge conflicts
8.15 Backport failed because of merge conflicts
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 195508

Questions ?

Please refer to the Backport tool documentation

kibanamachine added a commit that referenced this pull request Oct 9, 2024
…195535)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[UII] Adjust test based on ES version tested against
(#195508)](#195508)

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

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

<!--BACKPORT [{"author":{"name":"Jen
Huang","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-09T07:05:56Z","message":"[UII]
Adjust test based on ES version tested against (#195508)\n\n##
Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17
branch when\r\nthey 8.x ES compatibility tests were run, so this PR
adjusts the test\r\nbased on the ES version it runs against. This will
be backported to 8.x\r\nand
7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:all-open"],"title":"[UII]
Adjust test based on ES version tested
against","number":195508,"url":"https://github.com/elastic/kibana/pull/195508","mergeCommit":{"message":"[UII]
Adjust test based on ES version tested against (#195508)\n\n##
Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17
branch when\r\nthey 8.x ES compatibility tests were run, so this PR
adjusts the test\r\nbased on the ES version it runs against. This will
be backported to 8.x\r\nand
7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b"}},"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/195508","number":195508,"mergeCommit":{"message":"[UII]
Adjust test based on ES version tested against (#195508)\n\n##
Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17
branch when\r\nthey 8.x ES compatibility tests were run, so this PR
adjusts the test\r\nbased on the ES version it runs against. This will
be backported to 8.x\r\nand
7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b"}}]}] BACKPORT-->

Co-authored-by: Jen Huang <[email protected]>
@jen-huang jen-huang deleted the fix/es-test-overrides-multi branch October 9, 2024 18:11
jen-huang added a commit to jen-huang/kibana that referenced this pull request Oct 9, 2024
## Summary

Follow up to elastic#194764. This test was also failing on 7.17 branch when
they 8.x ES compatibility tests were run, so this PR adjusts the test
based on the ES version it runs against. This will be backported to 8.x
and 7.17.

(cherry picked from commit ab2d7aa)

# Conflicts:
#	x-pack/test/fleet_api_integration/apis/epm/install_overrides.ts
@jen-huang
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
8.15
7.17

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

Questions ?

Please refer to the Backport tool documentation

jen-huang added a commit that referenced this pull request Oct 9, 2024
…#195664)

# Backport

This will backport the following commits from `main` to `8.15`:
- [[UII] Adjust test based on ES version tested against
(#195508)](#195508)

<!--- Backport version: 8.9.8 -->

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

<!--BACKPORT [{"author":{"name":"Jen
Huang","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-09T07:05:56Z","message":"[UII]
Adjust test based on ES version tested against (#195508)\n\n##
Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17
branch when\r\nthey 8.x ES compatibility tests were run, so this PR
adjusts the test\r\nbased on the ES version it runs against. This will
be backported to 8.x\r\nand
7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:all-open","v8.16.0"],"number":195508,"url":"https://github.com/elastic/kibana/pull/195508","mergeCommit":{"message":"[UII]
Adjust test based on ES version tested against (#195508)\n\n##
Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17
branch when\r\nthey 8.x ES compatibility tests were run, so this PR
adjusts the test\r\nbased on the ES version it runs against. This will
be backported to 8.x\r\nand
7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/195508","number":195508,"mergeCommit":{"message":"[UII]
Adjust test based on ES version tested against (#195508)\n\n##
Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17
branch when\r\nthey 8.x ES compatibility tests were run, so this PR
adjusts the test\r\nbased on the ES version it runs against. This will
be backported to 8.x\r\nand
7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b"}},{"branch":"8.x","label":"v8.16.0","labelRegex":"^v8.16.0$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/195535","number":195535,"state":"MERGED","mergeCommit":{"sha":"327ce6a52181b2d6a7228a97f776a60a8909afd5","message":"[8.x]
[UII] Adjust test based on ES version tested against (#195508)
(#195535)\n\n# Backport\n\nThis will backport the following commits from
`main` to `8.x`:\n- [[UII] Adjust test based on ES version tested
against\n(#195508)](https://github.com/elastic/kibana/pull/195508)\n\n<!---
Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Jen\nHuang\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2024-10-09T07:05:56Z\",\"message\":\"[UII]\nAdjust
test based on ES version tested against
(#195508)\\n\\n##\nSummary\\r\\n\\r\\nFollow up to #194764. This test
was also failing on 7.17\nbranch when\\r\\nthey 8.x ES compatibility
tests were run, so this PR\nadjusts the test\\r\\nbased on the ES
version it runs against. This will\nbe backported to
8.x\\r\\nand\n7.17.\",\"sha\":\"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.16.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:skip\",\"Team:Fleet\",\"v9.0.0\",\"backport:all-open\"],\"title\":\"[UII]\nAdjust
test based on ES version
tested\nagainst\",\"number\":195508,\"url\":\"https://github.com/elastic/kibana/pull/195508\",\"mergeCommit\":{\"message\":\"[UII]\nAdjust
test based on ES version tested against
(#195508)\\n\\n##\nSummary\\r\\n\\r\\nFollow up to #194764. This test
was also failing on 7.17\nbranch when\\r\\nthey 8.x ES compatibility
tests were run, so this PR\nadjusts the test\\r\\nbased on the ES
version it runs against. This will\nbe backported to
8.x\\r\\nand\n7.17.\",\"sha\":\"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b\"}},\"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/195508\",\"number\":195508,\"mergeCommit\":{\"message\":\"[UII]\nAdjust
test based on ES version tested against
(#195508)\\n\\n##\nSummary\\r\\n\\r\\nFollow up to #194764. This test
was also failing on 7.17\nbranch when\\r\\nthey 8.x ES compatibility
tests were run, so this PR\nadjusts the test\\r\\nbased on the ES
version it runs against. This will\nbe backported to
8.x\\r\\nand\n7.17.\",\"sha\":\"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b\"}}]}]
BACKPORT-->\n\nCo-authored-by: Jen Huang <[email protected]>"}}]}]
BACKPORT-->
jen-huang added a commit that referenced this pull request Oct 9, 2024
…#195665)

# Backport

This will backport the following commits from `main` to `7.17`:
- [[UII] Adjust test based on ES version tested against
(#195508)](#195508)

<!--- Backport version: 8.9.8 -->

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

<!--BACKPORT [{"author":{"name":"Jen
Huang","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-09T07:05:56Z","message":"[UII]
Adjust test based on ES version tested against (#195508)\n\n##
Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17
branch when\r\nthey 8.x ES compatibility tests were run, so this PR
adjusts the test\r\nbased on the ES version it runs against. This will
be backported to 8.x\r\nand
7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Fleet","v9.0.0","backport:all-open","v8.16.0"],"number":195508,"url":"https://github.com/elastic/kibana/pull/195508","mergeCommit":{"message":"[UII]
Adjust test based on ES version tested against (#195508)\n\n##
Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17
branch when\r\nthey 8.x ES compatibility tests were run, so this PR
adjusts the test\r\nbased on the ES version it runs against. This will
be backported to 8.x\r\nand
7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/195508","number":195508,"mergeCommit":{"message":"[UII]
Adjust test based on ES version tested against (#195508)\n\n##
Summary\r\n\r\nFollow up to #194764. This test was also failing on 7.17
branch when\r\nthey 8.x ES compatibility tests were run, so this PR
adjusts the test\r\nbased on the ES version it runs against. This will
be backported to 8.x\r\nand
7.17.","sha":"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b"}},{"branch":"8.x","label":"v8.16.0","labelRegex":"^v8.16.0$","isSourceBranch":false,"url":"https://github.com/elastic/kibana/pull/195535","number":195535,"state":"MERGED","mergeCommit":{"sha":"327ce6a52181b2d6a7228a97f776a60a8909afd5","message":"[8.x]
[UII] Adjust test based on ES version tested against (#195508)
(#195535)\n\n# Backport\n\nThis will backport the following commits from
`main` to `8.x`:\n- [[UII] Adjust test based on ES version tested
against\n(#195508)](https://github.com/elastic/kibana/pull/195508)\n\n<!---
Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Jen\nHuang\",\"email\":\"[email protected]\"},\"sourceCommit\":{\"committedDate\":\"2024-10-09T07:05:56Z\",\"message\":\"[UII]\nAdjust
test based on ES version tested against
(#195508)\\n\\n##\nSummary\\r\\n\\r\\nFollow up to #194764. This test
was also failing on 7.17\nbranch when\\r\\nthey 8.x ES compatibility
tests were run, so this PR\nadjusts the test\\r\\nbased on the ES
version it runs against. This will\nbe backported to
8.x\\r\\nand\n7.17.\",\"sha\":\"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.16.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:skip\",\"Team:Fleet\",\"v9.0.0\",\"backport:all-open\"],\"title\":\"[UII]\nAdjust
test based on ES version
tested\nagainst\",\"number\":195508,\"url\":\"https://github.com/elastic/kibana/pull/195508\",\"mergeCommit\":{\"message\":\"[UII]\nAdjust
test based on ES version tested against
(#195508)\\n\\n##\nSummary\\r\\n\\r\\nFollow up to #194764. This test
was also failing on 7.17\nbranch when\\r\\nthey 8.x ES compatibility
tests were run, so this PR\nadjusts the test\\r\\nbased on the ES
version it runs against. This will\nbe backported to
8.x\\r\\nand\n7.17.\",\"sha\":\"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b\"}},\"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/195508\",\"number\":195508,\"mergeCommit\":{\"message\":\"[UII]\nAdjust
test based on ES version tested against
(#195508)\\n\\n##\nSummary\\r\\n\\r\\nFollow up to #194764. This test
was also failing on 7.17\nbranch when\\r\\nthey 8.x ES compatibility
tests were run, so this PR\nadjusts the test\\r\\nbased on the ES
version it runs against. This will\nbe backported to
8.x\\r\\nand\n7.17.\",\"sha\":\"ab2d7aa5682bb18514a9fbdb2a539914d36b2c7b\"}}]}]
BACKPORT-->\n\nCo-authored-by: Jen Huang <[email protected]>"}}]}]
BACKPORT-->
@mistic
Copy link
Member

mistic commented Oct 17, 2024

This PR didn't make it into the latest BC of v8.15.3. Updating the labels.

@mistic mistic added the v8.15.4 label Oct 17, 2024
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:Fleet Team label for Observability Data Collection Fleet team v8.15.4 v8.16.0 v9.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants