Skip to content

Don't reset upper bounds #135226

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Sep 23, 2025
Merged

Don't reset upper bounds #135226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f28ae55
Don't reset upper bounds
rjernst Sep 22, 2025
dc109fa
[CI] Auto commit changes from spotless
Sep 22, 2025
75bc04c
mute tests
rjernst Sep 22, 2025
6276834
mute more tests
rjernst Sep 23, 2025
24ce8bf
Merge branch 'main' into transport/skip_reset
rjernst Sep 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ...ovy/org/elasticsearch/gradle/internal/transport/TransportVersionGenerationFuncTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,9 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
assertUpperBound("9.2", "new_tv,8124000")
}

/*
temporarily muted, see https://github.com/elastic/elasticsearch/pull/135226

def "invalid changes to a upper bounds should be reverted"() {
given:
transportVersionUpperBound("9.2", "modification", "9000000")
Expand Down Expand Up @@ -144,7 +147,7 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
assertReferableDefinitionDoesNotExist("test_tv")
assertUpperBound("9.2", "existing_92,8123000")
assertUpperBound("9.1", "existing_92,8012001")
}
}*/

def "a reference can be renamed"() {
given:
Expand Down Expand Up @@ -242,8 +245,11 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
def "unreferenced definitions are removed"() {
given:
referableTransportVersion("test_tv", "8124000,8012002")
/*
TODO: reset of upper bounds
transportVersionUpperBound("9.2", "test_tv", "8124000")
transportVersionUpperBound("9.1", "test_tv", "8012002")
*/

when:
def result = runGenerateAndValidateTask().build()
Expand Down Expand Up @@ -406,6 +412,8 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
assertUpperBound("9.2", "new_tv,8124000")
}

/*
TODO: reset of upper bounds
def "deleted upper bounds files are restored"() {
given:
file("myserver/src/main/resources/transport/upper_bounds/9.2.csv").delete()
Expand All @@ -416,7 +424,7 @@ class TransportVersionGenerationFuncTest extends AbstractTransportVersionFuncTes
then:
assertGenerateAndValidateSuccess(result)
assertUpperBound("9.2", "existing_92,8123000")
}
}*/

def "upper bounds files must exist for backport branches"() {
when:
Expand Down
3 changes: 2 additions & 1 deletion ...a/org/elasticsearch/gradle/internal/transport/GenerateTransportVersionDefinitionTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ public void run() throws IOException {

getLogger().lifecycle("Generating transport version name: " + targetDefinitionName);
if (targetDefinitionName.isEmpty()) {
resetAllUpperBounds(resources);
// TODO: resetting upper bounds needs to be done locally, otherwise it pulls in some (incomplete) changes from upstream main
// resetAllUpperBounds(resources);
} else {
List<TransportVersionId> ids = updateUpperBounds(resources, upstreamUpperBounds, targetUpperBoundNames, targetDefinitionName);
// (Re)write the definition file.
Expand Down