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

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

Implement OpenSearch core branching strategy #290

prudhvigodithi opened this issue Jul 15, 2022 · 11 comments
Assignees
Labels
enhancement New feature or request

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 @praveensameneni @qreshi, can you please post an update and make the necessary changes to align with core branching strategy.
@bbarani @CEHENKLE @bbarani

@dblock dblock added the v2.4.0 'Issues and PRs related to version v2.4.0' label Sep 29, 2022
@dblock
Copy link
Member

dblock commented Sep 29, 2022

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

@bbarani bbarani removed the v2.2.0 label Oct 20, 2022
@bbarani
Copy link
Member

bbarani commented Oct 20, 2022

@qreshi Are we good to target this change for 2.4.0 release?

@praveensameneni praveensameneni removed the v2.4.0 'Issues and PRs related to version v2.4.0' label Jan 12, 2023
@qreshi
Copy link
Contributor

qreshi commented Jan 12, 2023

This was blocked for some time since Alerting backend couldn't bump main because Notifications couldn't get to 3.0 without issues. This has since been unblocked so if Alerting backend main is on 3.0, then we should bump Alerting OSD main and then we can close this out.

@bbarani
Copy link
Member

bbarani commented Jan 30, 2023

@qreshi Can you provide updated status of this issue?

@qreshi qreshi removed their assignment Jan 31, 2023
@qreshi
Copy link
Contributor

qreshi commented Jan 31, 2023

@lezzago and @AWSHurneyt may have a more up-to-date picture here. I saw that the Alerting backend was bumped to 3.0 yesterday so the frontend will likely soon follow.

@AWSHurneyt AWSHurneyt self-assigned this Jan 31, 2023
@AWSHurneyt AWSHurneyt mentioned this issue Jan 31, 2023
5 tasks
@bbarani
Copy link
Member

bbarani commented Apr 6, 2023

@AWSHurneyt @qreshi Whats the status of this issue?

@AWSHurneyt
Copy link
Collaborator

@AWSHurneyt @qreshi Whats the status of this issue?

I believe all that's missing at the moment is that the main branch is not currently set to version 3.0. There were some failures in the bump PR which I have on my tasks list to investigate.

@bbarani
Copy link
Member

bbarani commented Apr 13, 2023

@AWSHurneyt Can you please provide an update? Were you able to bump the version on main to 3.0?

@AWSHurneyt
Copy link
Collaborator

@AWSHurneyt Can you please provide an update? Were you able to bump the version on main to 3.0?

The main branch hasn't been bumped yet, but I'm planning to investigate the blockers for that this sprint.

@AWSHurneyt
Copy link
Collaborator

Alerting dashboards main has been bumped to 3.0.

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

No branches or pull requests

6 participants