sql icon indicating copy to clipboard operation
sql copied to clipboard

Implement OpenSearch core branching strategy

Open prudhvigodithi opened this issue 2 years ago • 4 comments

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

https://github.com/opensearch-project/opensearch-plugins/issues/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 avatar Jul 15 '22 15:07 prudhvigodithi

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

prudhvigodithi avatar Jul 28 '22 14:07 prudhvigodithi

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

ps48 avatar Jul 28 '22 17:07 ps48

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 avatar Jul 28 '22 18:07 ps48

@prudhvigodithi waiting for ml-commons to merge in 3.0

ps48 avatar Jul 28 '22 19:07 ps48

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

ps48 avatar Sep 14 '22 19:09 ps48

Try to upgrade main to 3.0 failed. https://github.com/opensearch-project/sql/pull/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

penghuo avatar Sep 14 '22 19:09 penghuo

The job-scheduler issue was fixed, see https://github.com/opensearch-project/job-scheduler/pull/242.

dblock avatar Sep 29 '22 16:09 dblock

  • 2.x branch is ready.
  • main branch is blocked. because of IT failed. https://github.com/opensearch-project/sql/actions/runs/3055823327/jobs/4929313950. Need investigate more, seems breaking change in core.

penghuo avatar Sep 29 '22 16:09 penghuo

To close this issue:

  • [x] main is building 3.0
  • [x] 2.x is building next 2.x, which is currently 2.4.0
  • [x] 2.3 is building next 2.3, which is 2.3.1
  • [ ] manifests in https://github.com/opensearch-project/opensearch-build/tree/main/manifests include all 3

dblock avatar Sep 29 '22 16:09 dblock

2.3.1. https://github.com/opensearch-project/sql/pull/894

penghuo avatar Oct 06 '22 20:10 penghuo

manifest PR. https://github.com/opensearch-project/opensearch-build/pull/2766

penghuo avatar Oct 20 '22 17:10 penghuo

@penghuo Updating the tagged version for this issue to 2.4.0

bbarani avatar Oct 20 '22 21:10 bbarani