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

Closed
Tracked by #142
prudhvigodithi opened this issue Jul 15, 2022 · 6 comments · Fixed by #1121
Closed
Tracked by #142

Implement OpenSearch core branching strategy #1034

prudhvigodithi opened this issue Jul 15, 2022 · 6 comments · Fixed by #1121
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 prudhvigodithi added the enhancement New feature or request label Jul 15, 2022
@peternied
Copy link
Member

This has already been adopted for this repository, what is the intended action of this issue?

@prudhvigodithi
Copy link
Member Author

Hey @peternied if Core branching is already adopted to security-dashboards-plugin, we can close this issue.

@dblock
Copy link
Member

dblock commented Sep 29, 2022

Could we please double check that:

@peternied
Copy link
Member

Keeping this open until the final checklist has been completed

@peternied peternied reopened this Sep 29, 2022
@davidlago davidlago added v2.4.0 'Issues and PRs related to version v2.4.0' and removed v2.2.0 labels Oct 3, 2022
@stephen-crawford
Copy link
Contributor

I will take care of this @scrawfor99

@stephen-crawford
Copy link
Contributor

@peternied, currently main is building 2.4.0; 2.x is building 2.4.0; 2.3 is building 2.4.0 for fixing main and 2.3, do I simply adjust the version numbers in the config files or should I move the head backwards for 2.3 as well?

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

Successfully merging a pull request may close this issue.

5 participants