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 #205

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

Implement OpenSearch core branching strategy #205

prudhvigodithi opened this issue Jul 15, 2022 · 7 comments
Labels
enhancement New feature or request untriaged v2.4.0 'Issues and PRs related to version v2.4.0'

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 @amitgalitz can you please post an update and make the necessary changes to align with core branching strategy.
Thank you
@dblock @bbarani @CEHENKLE

@amitgalitz
Copy link
Member

Hi @prudhvigodithi I have a PR open to bump main on JS to 3.0.0-SNAPSHOT but there are some failures on BWC. I'm looking into it more, might need some help from @sbcd90 who recently added these tests.

@dblock
Copy link
Member

dblock commented Sep 29, 2022

I fixed the bcw issue in #242.

@dblock
Copy link
Member

dblock commented Sep 29, 2022

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

@dblock
Copy link
Member

dblock commented Oct 13, 2022

I fixed #242, so that closes the main part above.

@bbarani bbarani added v2.4.0 'Issues and PRs related to version v2.4.0' and removed v2.2.0 labels Oct 20, 2022
@bbarani
Copy link
Member

bbarani commented Oct 20, 2022

@amitgalitz @minalsha I have re-tagged this issue to 2.4.0 release. Can you please provide an update on this issue?

@amitgalitz
Copy link
Member

Main is at 3.0, 2.x at 2.4 and 2.3 at 2.3.1. Also job scheduler is in manifest for 2.3.1, 2.4.0 and 3.0.0. We can close this issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request untriaged v2.4.0 'Issues and PRs related to version v2.4.0'
Projects
None yet
Development

No branches or pull requests

4 participants