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

Closed
Tracked by #142
prudhvigodithi opened this issue Jul 15, 2022 · 9 comments · Fixed by opensearch-project/opensearch-build#2696
Closed
Tracked by #142
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.

@ps48
Copy link
Member

ps48 commented Jul 28, 2022

@prudhvigodithi We've updated branches 1.x and 2.x (created from 2.1).

@ps48 ps48 self-assigned this Jul 28, 2022
@ps48 ps48 closed this as completed Jul 28, 2022
@ps48 ps48 reopened this Jul 28, 2022
@ps48
Copy link
Member

ps48 commented Jul 28, 2022

@prudhvigodithi waiting for job-scheduler to merge in 3.0

@dblock
Copy link
Member

dblock commented Sep 29, 2022

@ps48 That was done.

@ps48
Copy link
Member

ps48 commented Oct 10, 2022

Status:

@ps48
Copy link
Member

ps48 commented Oct 11, 2022

3.0 merge to main is blocked by manifests update 2.4.0 PR pending in opensearch-build repo.

@ps48
Copy link
Member

ps48 commented Oct 13, 2022

Waiting for 2.4.0 dist. build to be successful on OS side. This is needed to merge 3.0.0's bwc testing.

@ps48
Copy link
Member

ps48 commented Oct 14, 2022

2.4.0 artifact is available. 3.0.0 build fails due to upstream changes from common utils: opensearch-project/common-utils#281

@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

@ps48 re-tagging the issue with 2.4.0 release.

@ps48
Copy link
Member

ps48 commented Oct 25, 2022

The branches are updated and added to build. Closing the issue.

@ps48 ps48 closed this as completed Oct 25, 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

Successfully merging a pull request may close this issue.

5 participants