Version checks are incorrectly returning versions < 1.0.0. #797
Conversation
Signed-off-by: dblock <[email protected]>
Signed-off-by: dblock <[email protected]>
- no unreleased version if the current version is "1.0.0" - add unit tests for OpenSearch 1.0.0 with legacy ES versions. - update VersionUtils to include all legacy ES versions as released. Signed-off-by: Rabi Panda <[email protected]>
|
✅ Gradle Wrapper Validation success 5bf797a |
|
✅ DCO Check Passed 5bf797a |
|
✅ Gradle Precommit success 5bf797a |
|
start gradle check |
1 similar comment
|
start gradle check |
dblock
added
the
backport
|
I wonder whether infra automation kicked off the job twice ;) @camerski
|
| @@ -139,7 +139,6 @@ | |||
| public static final LegacyESVersion V_7_10_0 = new LegacyESVersion(7100099, org.apache.lucene.util.Version.LUCENE_8_7_0); | |||
| public static final LegacyESVersion V_7_10_1 = new LegacyESVersion(7100199, org.apache.lucene.util.Version.LUCENE_8_7_0); | |||
| public static final LegacyESVersion V_7_10_2 = new LegacyESVersion(7100299, org.apache.lucene.util.Version.LUCENE_8_7_0); | |||
| public static final LegacyESVersion V_7_10_3 = new LegacyESVersion(7100399, org.apache.lucene.util.Version.LUCENE_8_7_0); | |||
There was a problem hiding this comment.
My understanding was the 7.10 branch in elastic which we forked out was 7.10.3.
So we are saying the next releasable version after 7.10.2 is 1.0.0. Is my understanding correct?
There was a problem hiding this comment.
The version logic is to bump the version after a release. 7.10.3 was the unreleased version of the fork which effectively became 1.0.0 - the current unreleased version for OpenSearch.
When it's released, we will bump to 1.0.1 for the Version file of 1.0 branch and that will be the next unreleased version for that branch. This is the unreleased bugfix.
The 1.x branch's unreleased version will be 1.1.0 that is unreleased minor.
The main branch will be updated to the next major version 2.0.0 which will be the next unreleased major.
So, in the Version file , the last version is the unreleased one, everything else is released.
There was a problem hiding this comment.
The special case is that 7.10.3 will never exist in our world, we just say that 7.10.2 was the last released version and aren't trying to assume there will be a 7.10.3 in the future at all.
| @@ -268,6 +268,11 @@ private String getBranchFor(Version version) { | |||
| // The current version is being worked, is always unreleased | |||
| unreleased.add(currentVersion); | |||
|
|
|||
| // No unreleased versions for 1.0.0 | |||
There was a problem hiding this comment.
Trying to wrap my head around this.
When we have 1.1.0 released how would this be?
…h-project#797) * Version checks are incorrectly returning versions < 1.0.0. Signed-off-by: dblock <[email protected]> * Removed V_7_10_3 which has not been released as of time of the fork. Signed-off-by: dblock <[email protected]> * Update check for current version to get unreleased versions. - no unreleased version if the current version is "1.0.0" - add unit tests for OpenSearch 1.0.0 with legacy ES versions. - update VersionUtils to include all legacy ES versions as released. Signed-off-by: Rabi Panda <[email protected]> Co-authored-by: Rabi Panda <[email protected]>
…h-project#797) * Version checks are incorrectly returning versions < 1.0.0. Signed-off-by: dblock <[email protected]> * Removed V_7_10_3 which has not been released as of time of the fork. Signed-off-by: dblock <[email protected]> * Update check for current version to get unreleased versions. - no unreleased version if the current version is "1.0.0" - add unit tests for OpenSearch 1.0.0 with legacy ES versions. - update VersionUtils to include all legacy ES versions as released. Signed-off-by: Rabi Panda <[email protected]> Co-authored-by: Rabi Panda <[email protected]>
* Version checks are incorrectly returning versions < 1.0.0. * Removed V_7_10_3 which has not been released as of time of the fork. * Update check for current version to get unreleased versions. - no unreleased version if the current version is "1.0.0" - add unit tests for OpenSearch 1.0.0 with legacy ES versions. - update VersionUtils to include all legacy ES versions as released. Signed-off-by: Rabi Panda <[email protected]> Signed-off-by: dblock <[email protected]> Co-authored-by: Rabi Panda <[email protected]>
* Version checks are incorrectly returning versions < 1.0.0. * Removed V_7_10_3 which has not been released as of time of the fork. * Update check for current version to get unreleased versions. - no unreleased version if the current version is "1.0.0" - add unit tests for OpenSearch 1.0.0 with legacy ES versions. - update VersionUtils to include all legacy ES versions as released. Signed-off-by: Rabi Panda <[email protected]> Signed-off-by: dblock <[email protected]> Co-authored-by: Rabi Panda <[email protected]>
Same as #791 but into main, where we run all of CI, first.
Not sure what the correct protocol is.Description
The first issue in #786 is caused by integration tests trying to fetch 7.10.3 from source. This is because the code thinks 7.10.3 has not been released yet. There are two problems fixed in this PR:
There's a new set of tests for versions for OpenSearch 1.0 to avoid conflating with version tests that presume that the next released version will be 8 and that the 7 series is not fully released. Thanks @adnapibar for those!
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.