Add explicit versions in the branches.json and use them for calculating unreleased versions for BwC tests #129637
+856
−219
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
elasticsearchmachine
added
the
serverless-linked
By default, it now reads branches.json from main branch of Elasticsearch (through GitHub raw link) . This can be overridden for testing or when there is a problem with remote call.
jozala
force-pushed
the
bwc-explicit-branches-version
branch
from
1e1a591 to
d84fef9
Compare
breskeby
reviewed
Jun 23, 2025
|
|
||
| @TaskAction | ||
| public void executeTask() throws IOException { | ||
| File branchesFile = new File(Util.locateElasticsearchWorkspace(project.getGradle()), "branches.json"); |
There was a problem hiding this comment.
referencing project here while executing task is deprecated. In this case I think we should just inject ProjectLayout instead of project in the ctor and then use layout.getSettingsDirectory().file('branches.json').asFile.
The Util.locateElasticsearchWorkspace is just a utility method only used to resolve files relateive from internal builds within this repository, which we don't need here as we never run this task anywhere else but in the :elasticsearch root build
There was a problem hiding this comment.
Also we probably want to make this file an outputFile property of the task
breskeby
reviewed
Jun 23, 2025
| private final ObjectMapper objectMapper; | ||
| private final BranchesFileParser branchesFileParser; | ||
|
|
||
| @Nullable |
breskeby
approved these changes
Jun 23, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Work in progress
Gradle task added to modify
branches.json. Possibility to add, remove and update branches in the file with theversionfield added next to thebranch.After the change the file looks like this:
{ "branches": [ { "branch": "main", "version": "9.1.0" }, { "branch": "9.0", "version": "9.0.3" }, { "branch": "8.19", "version": "8.19.1" } ] }BwC test configuration has been changed to use changed
branches.jsonfile to calculate unreleased ES versions, instead of combining data fromVersion.javaandbranches.json.