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

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

Implement OpenSearch core branching strategy #451

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

Comments

@prudhvigodithi
Copy link
Contributor

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
Contributor Author

prudhvigodithi commented Jul 28, 2022

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

@ankitkala
Copy link
Member

We're following the branching strategy. However main is not on 3.0 as security plugin is still not on 3.0.
Tracking issue: opensearch-project/security#1953

@dblock
Copy link
Member

dblock commented Sep 29, 2022

The job-scheduler issue was fixed, see opensearch-project/job-scheduler#242.

@dblock
Copy link
Member

dblock commented Sep 29, 2022

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

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

bbarani commented Oct 20, 2022

@ankitkala Re-tagging this issue to v2.4.0

@ankitkala
Copy link
Member

Closing the issue as all tasks have been addressed.

@krishna-ggk
Copy link
Collaborator

Reopening - should we keep this open until we automate it? (For example 2.x should now be tracking 2.5)

@krishna-ggk krishna-ggk reopened this Nov 10, 2022
@ankitkala
Copy link
Member

Closing this for now. bump up on 2.x depends on security plugin.

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

No branches or pull requests

6 participants