Skip to content

Fix issue with updating core with a patch number other than 0#19377

Merged
sandeshkr419 merged 4 commits intoopensearch-project:mainfrom
cwperks:fix-patch-release
Oct 16, 2025
Merged

Fix issue with updating core with a patch number other than 0#19377
sandeshkr419 merged 4 commits intoopensearch-project:mainfrom
cwperks:fix-patch-release

Conversation

@cwperks
Copy link
Copy Markdown
Member

@cwperks cwperks commented Sep 23, 2025

Description

While researching opensearch-project/opensearch-build#5720, I ran into an issue where I could not version bump the core to 3.3.1 and run ./gradlew localDistro successfully. It would run into the following error:

* What went wrong:
An exception occurred applying plugin request [id: 'opensearch.global-build-info']
> Failed to apply plugin 'opensearch.global-build-info'.
   > Expected exactly 2 majors in parsed versions but found: [2, 3, 6, 7]

The reason for this is that it hit this block which is only triggered when the minor and patch version are both non-zero. When the patch number is 0 (as it is with any minor version bump) then the condition never gets triggered.

This PR resolves the issue by removing references to the Legacy ES version numbers which are more than 2 major versions in the past at this point.

Related Issues

Related to opensearch-project/opensearch-build#5720

Check List

  • Functionality includes testing.
  • API changes companion pull request created, if applicable.
  • Public documentation issue/PR created, if applicable.

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.

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks cwperks requested a review from a team as a code owner September 23, 2025 15:29
Signed-off-by: Craig Perkins <cwperx@amazon.com>
@github-actions
Copy link
Copy Markdown
Contributor

✅ Gradle check result for be0a4b5: SUCCESS

@codecov
Copy link
Copy Markdown

codecov bot commented Sep 23, 2025

Codecov Report

❌ Patch coverage is 0% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 73.08%. Comparing base (b9781c1) to head (2d5bd75).
⚠️ Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
.../opensearch/gradle/info/GlobalBuildInfoPlugin.java 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main   #19377      +/-   ##
============================================
- Coverage     73.09%   73.08%   -0.01%     
- Complexity    70702    70752      +50     
============================================
  Files          5725     5725              
  Lines        323795   323793       -2     
  Branches      46882    46882              
============================================
- Hits         236684   236656      -28     
- Misses        68013    68108      +95     
+ Partials      19098    19029      -69     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@github-actions
Copy link
Copy Markdown
Contributor

❌ Gradle check result for 891235b: FAILURE

Please examine the workflow log, locate, and copy-paste the failure(s) below, then iterate to green. Is the failure a flaky test unrelated to your change?

@github-actions
Copy link
Copy Markdown
Contributor

❕ Gradle check result for 891235b: UNSTABLE

Please review all flaky tests that succeeded after retry and create an issue if one does not already exist to track the flaky failure.

Copy link
Copy Markdown
Member

@sandeshkr419 sandeshkr419 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM - time to rebase from main I guess!

Signed-off-by: Craig Perkins <cwperx@amazon.com>
@cwperks
Copy link
Copy Markdown
Member Author

cwperks commented Oct 16, 2025

LGTM - time to rebase from main I guess!

Done.

@github-actions
Copy link
Copy Markdown
Contributor

✅ Gradle check result for 2d5bd75: SUCCESS

@sandeshkr419 sandeshkr419 merged commit 4094287 into opensearch-project:main Oct 16, 2025
32 of 33 checks passed
@sandeshkr419 sandeshkr419 added the backport 3.3 Backport to 3.3 branch label Oct 16, 2025
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 16, 2025
* Fix issue with updating core with a patch number other than 0

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit 4094287)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@sandeshkr419
Copy link
Copy Markdown
Member

Backporting to 3.3 branch to facilitate (potential) 3.3.1 patch release.

Ref discussion: #19660

sandeshkr419 added a commit that referenced this pull request Oct 17, 2025
… than 0 (#19667)

* Fix issue with updating core with a patch number other than 0 (#19377)

* Fix issue with updating core with a patch number other than 0

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit 4094287)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Update CHANGELOG to remove unwanted

Removed several fixed issues from the CHANGELOG.

Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Sandesh Kumar <sandeshkr419@gmail.com>
rgsriram pushed a commit to rgsriram/OpenSearch that referenced this pull request Oct 18, 2025
…arch-project#19377)

* Fix issue with updating core with a patch number other than 0

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
kh3ra pushed a commit to kh3ra/OpenSearch that referenced this pull request Oct 23, 2025
…arch-project#19377)

* Fix issue with updating core with a patch number other than 0

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 3.3 Backport to 3.3 branch

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants