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

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

Implement OpenSearch core branching strategy #481

prudhvigodithi opened this issue Jul 15, 2022 · 7 comments
Assignees
Labels
enhancement New feature or request 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

Hey @qreshi can you please post an update and make the necessary changes to align with core branching strategy.
Thank you
@dblock @CEHENKLE @bbarani

@qreshi
Copy link
Contributor

qreshi commented Jul 28, 2022

I was blocked on Common Utils before. I'll proceed with updating Notifications now.

@qreshi
Copy link
Contributor

qreshi commented Aug 1, 2022

Upgrading main to 3.0 is currently blocked on opensearch-project/OpenSearch#3615

@qreshi
Copy link
Contributor

qreshi commented Aug 16, 2022

Since the issue linked above is still ongoing and we can't upgrade to 3.0 on main, I'll update the version tag for this issue for tracking. I'd like to make sure main is on the most up-to-date development version before closing this issue out.

@qreshi qreshi added v2.3.0 'Issues and PRs related to version v2.3.0' and removed v2.2.0 labels Aug 16, 2022
@qreshi qreshi added v2.4.0 'Issues and PRs related to version v2.4.0' and removed v2.3.0 'Issues and PRs related to version v2.3.0' labels Sep 15, 2022
@lezzago lezzago mentioned this issue Oct 6, 2022
1 task
@lezzago lezzago mentioned this issue Oct 27, 2022
1 task
@lezzago
Copy link
Member

lezzago commented Nov 14, 2022

@lezzago
Copy link
Member

lezzago commented Nov 22, 2022

Above have been unblocked, but now Notification needs to be on 2.5. For that to occur, PA and Security needs to be here, so the 3.0 bump is still blocked.

@qreshi
Copy link
Contributor

qreshi commented Dec 17, 2022

Closing as all branches are now up-to-date.

@qreshi qreshi closed this as completed Dec 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request v2.4.0 'Issues and PRs related to version v2.4.0'
Projects
None yet
Development

No branches or pull requests

4 participants