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

Implement OpenSearch core branching strategy #366

Closed
Tracked by #142
prudhvigodithi opened this issue Jul 15, 2022 · 5 comments
Closed
Tracked by #142

Implement OpenSearch core branching strategy #366

prudhvigodithi opened this issue Jul 15, 2022 · 5 comments
Labels

Comments

@prudhvigodithi
Copy link
Member

Description

Ensure MAJOR_VERSION.x branch exists, the main branch acts as source of truth effectively working on 2 versions at the same time.

Related META issue

opensearch-project/opensearch-plugins#142

Current Behavior

Currently plugins follow a branching strategy where they work on main for the next development iteration, effectively working on 2 versions at the same time. This is not always true for all plugins, the release branch or branch pattern is not consistent, the lack of this standardization would limit multiple automation workflows and alignment with core repo. More details on META ISSUE

Proposed solution

Follow OpenSearch core branching. Create 1.x and 2.x branches, do not create 2.0 as a branch of main, instead create main -> 2.x -> 2.0. Maintain working CI for 3 releases at any given time.

@prudhvigodithi
Copy link
Member Author

prudhvigodithi commented Jul 28, 2022

Hey @sean-zheng-amazon @ylwu-amzn can you please post an update and make the necessary changes to align with core branching strategy.
Thank you
@dblock @bbarani @CEHENKLE

@ylwu-amzn
Copy link
Collaborator

ylwu-amzn commented Jul 28, 2022

Thanks @prudhvigodithi, I think this branching strategy is good and ml-commons is following this strategy.
You can cut an issue or comment here if you see any part violating this strategy.

@ps48
Copy link
Member

ps48 commented Aug 12, 2022

@ylwu-amzn @prudhvigodithi SQL main branch PR is waiting ml-commons main to be bumped to 3.0.

@ylwu-amzn
Copy link
Collaborator

ylwu-amzn commented Aug 12, 2022

Thanks for reminding, @rbhavna is working on bumping main branch to 3.0

@dblock
Copy link
Member

dblock commented Sep 29, 2022

There should be nothing blocking this rn. To close this issue:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

5 participants