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

[PROPOSAL] Standardize branching strategy #27

Closed
andrross opened this issue Jan 31, 2023 · 6 comments
Closed

[PROPOSAL] Standardize branching strategy #27

andrross opened this issue Jan 31, 2023 · 6 comments
Assignees

Comments

@andrross
Copy link
Member

The OpenSearch project generally follows a strategy of tracking 3 releases in parallel (next major, next minor, and current). See RELEASING.md for more details. This repository currently only has a main branch that is targeting version 1.2.4. Should we update to match the OpenSearch branching strategy. If not, why not?

Assuming the answer is yes, then the steps are (I think?):

  • Create branch 1.2, which will be the current commit on main, supporting version 1.2.4
  • Create branch 1.3 and implement support for version 1.3.8
  • Create branch 2.x and implement support for 2.6.0
  • Implement support for 3.0.0 on main
@andrross andrross changed the title [PROPOSAL] Standarize branching strategy [PROPOSAL] Standardize branching strategy Jan 31, 2023
@anasalkouz
Copy link
Member

anasalkouz commented Jan 31, 2023

@dblock or @samuel-oci not sure if you have some context on this repository
Is any reason why it is not following OpenSearch branching strategy?
Why it's not part of the OpenSearch release bundle?

@wbeckler
Copy link

wbeckler commented Feb 1, 2023

I propose that this entire repo be moved here: https://github.com/opensearch-project/OpenSearch/tree/main/plugins in a subdirectory called "repository-oci," just like there is a repository-azure and a repository-s3. If not, then why not create repos for those other cloud file stores?

@wbeckler
Copy link

wbeckler commented Feb 1, 2023

I've opened an issue suggesting this: opensearch-project/OpenSearch#6148

@sam-herman
Copy link
Collaborator

Hi @anasalkouz @andrross @wbeckler , some context:
Originally it was created as a separate repo in order to allow the community time to decide how to address object storage repository plugins in the community. The community feedback at the time was captured here:
opensearch-project/OpenSearch#1854

I agree with @wbeckler suggestion, I think that moving it into the core for now will probably make sure it remains consistent with both versioning strategy and will make routine maintenance and upgrade efforts easier.

@sam-herman
Copy link
Collaborator

Regarding the branching strategy, if we want to take more time before moving it into the core, using a proper conventional branching strategy can't hurt.

@sam-herman
Copy link
Collaborator

I created a 1.3 branch from the current commit on main. After merging #33 I will create a 2.4 branch.
Going forward will keep the above branching strategy after any version upgrade. Closing this for now while the suggestion to move to the monolith is discussed here: https://github.com/opensearch-project/OpenSearch/tree/main/plugins.

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

No branches or pull requests

4 participants