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

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

Implement OpenSearch core branching strategy #692

prudhvigodithi opened this issue Jul 15, 2022 · 12 comments
Assignees
Labels
enhancement New feature or request 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

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

@ps48
Copy link
Member

ps48 commented Jul 28, 2022

@prudhvigodithi I'm currently aligning 1.x and 2.x branches. Do we have to update main to 3.0?

@ps48
Copy link
Member

ps48 commented Jul 28, 2022

Updated 1.x and created 2.x from main. @prudhvigodithi please feel free to re-open the issue, if the main needs to be updated to 3.0

@ps48 ps48 closed this as completed Jul 28, 2022
@ps48 ps48 mentioned this issue Jul 28, 2022
6 tasks
@ps48 ps48 reopened this Jul 28, 2022
@ps48
Copy link
Member

ps48 commented Jul 28, 2022

@prudhvigodithi waiting for ml-commons to merge in 3.0

@ps48
Copy link
Member

ps48 commented Sep 14, 2022

Closed the PR for bumping main branch to 3.0, for now. Will reopen once we have decision opensearch-project/opensearch-plugins#142. Let's keep this issue open.

@penghuo
Copy link
Collaborator

penghuo commented Sep 14, 2022

Try to upgrade main to 3.0 failed. #831.

 > Could not find org.apache.lucene:lucene-core:9.4.0-snapshot-ddf0d0a.
   Searched in the following locations:
     - file:/home/runner/.m2/repository/org/apache/lucene/lucene-core/9.4.0-snapshot-ddf0d0a/lucene-core-9.4.0-snapshot-ddf0d0a.pom
     - https://aws.oss.sonatype.org/content/repositories/snapshots/org/apache/lucene/lucene-core/9.4.0-snapshot-ddf0d0a/lucene-core-9.4.0-snapshot-ddf0d0a.pom
     - https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/9.4.0-snapshot-ddf0d0a/lucene-core-9.4.0-snapshot-ddf0d0a.pom

@dblock
Copy link
Member

dblock commented Sep 29, 2022

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

@penghuo
Copy link
Collaborator

penghuo commented Sep 29, 2022

@dblock
Copy link
Member

dblock commented Sep 29, 2022

To close this issue:

@penghuo
Copy link
Collaborator

penghuo commented Oct 6, 2022

2.3.1. #894

@penghuo
Copy link
Collaborator

penghuo commented Oct 20, 2022

manifest PR. opensearch-project/opensearch-build#2766

@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

@penghuo Updating the tagged version for this issue to 2.4.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 v2.4.0 'Issues and PRs related to version v2.4.0'
Projects
None yet
Development

No branches or pull requests

6 participants