Skip to content

[OAS] Removing staging files#197455

Merged
jloleysens merged 4 commits intoelastic:mainfrom
jloleysens:oas/remove-staging-files
Oct 24, 2024
Merged

[OAS] Removing staging files#197455
jloleysens merged 4 commits intoelastic:mainfrom
jloleysens:oas/remove-staging-files

Conversation

@jloleysens
Copy link
Copy Markdown
Contributor

@jloleysens jloleysens commented Oct 23, 2024

Summary

Removing staging files for now. We can always revert this if it turns out we need them.

Reviewers

  • I might be missing something in removing these, but right now I think they are making commit noise and not really serving a purpose
  • I moved the final_merge step to after the OAS snapshot capture

@jloleysens jloleysens added Team:Core Platform Core services: plugins, logging, config, saved objects, http, ES client, i18n, etc t// release_note:skip Skip the PR/issue when compiling release notes v9.0.0 Feature:OAS Work or issues related to Core-provided mechanisms for generating OAS backport:version Backport to applied version labels v8.17.0 labels Oct 23, 2024
@jloleysens jloleysens requested review from lcawl and maximpn October 23, 2024 14:08
@jloleysens jloleysens self-assigned this Oct 23, 2024
@jloleysens jloleysens requested a review from a team as a code owner October 23, 2024 14:08
@elasticmachine
Copy link
Copy Markdown
Contributor

Pinging @elastic/kibana-core (Team:Core)

Copy link
Copy Markdown
Contributor

@jbudz jbudz left a comment

Choose a reason for hiding this comment

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

CI changes LGTM

Copy link
Copy Markdown
Contributor

@maximpn maximpn left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -14,4 +14,3 @@ fi
.buildkite/scripts/steps/code_generation/security_solution_codegen.sh
.buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nit: It looks like .buildkite/scripts/steps/openapi_bundling/security_solution_openapi_bundling.sh script could be moved to .buildkite/scripts/steps/checks/capture_oas_snapshot.sh since it has a similar purpose but limited to Security Solution only.

@jloleysens jloleysens enabled auto-merge (squash) October 24, 2024 07:37
@jloleysens jloleysens merged commit 77ce0fc into elastic:main Oct 24, 2024
@elasticmachine
Copy link
Copy Markdown
Contributor

💚 Build Succeeded

Metrics [docs]

✅ unchanged

History

cc @jloleysens

@kibanamachine
Copy link
Copy Markdown
Contributor

Starting backport for target branches: 8.x

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

@kibanamachine
Copy link
Copy Markdown
Contributor

💔 All backports failed

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

You might need to backport the following PRs to 8.x:
- [ci] Extract OAS check + add retry (#196534)

Manual backport

To create the backport manually run:

node scripts/backport --pr 197455

Questions ?

Please refer to the Backport tool documentation

@jloleysens jloleysens deleted the oas/remove-staging-files branch October 25, 2024 09:18
@jloleysens
Copy link
Copy Markdown
Contributor Author

💚 All backports created successfully

Status Branch Result
8.x

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

Questions ?

Please refer to the Backport tool documentation

jloleysens added a commit to jloleysens/kibana that referenced this pull request Oct 25, 2024
## Summary

Removing staging files for now. We can always revert this if it turns
out we need them.

## Reviewers

* I might be missing something in removing these, but right now I think
they are making commit noise and not really serving a purpose
* I moved the `final_merge` step to after the OAS snapshot capture

(cherry picked from commit 77ce0fc)

# Conflicts:
#	.buildkite/scripts/steps/capture_oas_snapshot.sh
#	oas_docs/output/kibana.serverless.staging.yaml
#	oas_docs/output/kibana.staging.yaml
#	oas_docs/scripts/merge_ess_oas_staging.js
#	oas_docs/scripts/merge_serverless_oas_staging.js
jloleysens added a commit that referenced this pull request Oct 28, 2024
# Backport

This will backport the following commits from `main` to `8.x`:
- [[OAS] Removing staging files
(#197455)](#197455)

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

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

<!--BACKPORT [{"author":{"name":"Jean-Louis
Leysens","email":"jeanlouis.leysens@elastic.co"},"sourceCommit":{"committedDate":"2024-10-24T14:52:13Z","message":"[OAS]
Removing staging files (#197455)\n\n## Summary\r\n\r\nRemoving staging
files for now. We can always revert this if it turns\r\nout we need
them.\r\n\r\n## Reviewers\r\n\r\n* I might be missing something in
removing these, but right now I think\r\nthey are making commit noise
and not really serving a purpose\r\n* I moved the `final_merge` step to
after the OAS snapshot
capture","sha":"77ce0fcbcf18805d2ae1ac2d21a449c03deec022","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Core","release_note:skip","v9.0.0","Feature:OAS","backport:version","v8.17.0"],"number":197455,"url":"https://github.com/elastic/kibana/pull/197455","mergeCommit":{"message":"[OAS]
Removing staging files (#197455)\n\n## Summary\r\n\r\nRemoving staging
files for now. We can always revert this if it turns\r\nout we need
them.\r\n\r\n## Reviewers\r\n\r\n* I might be missing something in
removing these, but right now I think\r\nthey are making commit noise
and not really serving a purpose\r\n* I moved the `final_merge` step to
after the OAS snapshot
capture","sha":"77ce0fcbcf18805d2ae1ac2d21a449c03deec022"}},"sourceBranch":"main","suggestedTargetBranches":["8.x"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","labelRegex":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/197455","number":197455,"mergeCommit":{"message":"[OAS]
Removing staging files (#197455)\n\n## Summary\r\n\r\nRemoving staging
files for now. We can always revert this if it turns\r\nout we need
them.\r\n\r\n## Reviewers\r\n\r\n* I might be missing something in
removing these, but right now I think\r\nthey are making commit noise
and not really serving a purpose\r\n* I moved the `final_merge` step to
after the OAS snapshot
capture","sha":"77ce0fcbcf18805d2ae1ac2d21a449c03deec022"}},{"branch":"8.x","label":"v8.17.0","labelRegex":"^v8.17.0$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->
jloleysens pushed a commit that referenced this pull request Nov 1, 2024
)

## Summary

Relates to #197455

Some of the staging and serverless OpenAPI files persist in 8.x and
earlier branches, so this PR removes them to hopefully reduce merge
conflicts.
lcawl pushed a commit to lcawl/kibana that referenced this pull request Nov 8, 2024
Removing staging files for now. We can always revert this if it turns
out we need them.

* I might be missing something in removing these, but right now I think
they are making commit noise and not really serving a purpose
* I moved the `final_merge` step to after the OAS snapshot capture

(cherry picked from commit 77ce0fc)
lcawl added a commit that referenced this pull request Nov 9, 2024
# Backport

This will backport the following commits from `main` to `8.16`:
 - [OAS] Removing staging files (#197455) (77ce0fc)

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

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

<!--BACKPORT [{"author":{"name":"Jean-Louis
Leysens","email":"jeanlouis.leysens@elastic.co"},"sourceCommit":{"committedDate":"2024-10-24T14:52:13Z","message":"[OAS]
Removing staging files (#197455)\n\n## Summary\r\n\r\nRemoving staging
files for now. We can always revert this if it turns\r\nout we need
them.\r\n\r\n## Reviewers\r\n\r\n* I might be missing something in
removing these, but right now I think\r\nthey are making commit noise
and not really serving a purpose\r\n* I moved the `final_merge` step to
after the OAS snapshot
capture","sha":"77ce0fcbcf18805d2ae1ac2d21a449c03deec022"},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[]}]
BACKPORT-->

Co-authored-by: Jean-Louis Leysens <jeanlouis.leysens@elastic.co>
@mistic mistic added the v8.16.1 label Nov 12, 2024
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 Feature:OAS Work or issues related to Core-provided mechanisms for generating OAS release_note:skip Skip the PR/issue when compiling release notes Team:Core Platform Core services: plugins, logging, config, saved objects, http, ES client, i18n, etc t// v8.16.1 v8.17.0 v9.0.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants