Skip to content

Conversation

@mark-vieira
Copy link
Contributor

Backport

This will backport the following commits from main to 9.0:

Questions ?

Please refer to the Backport tool documentation

(cherry picked from commit e149a3e)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java
#	test/external-modules/error-query/build.gradle
#	test/external-modules/error-query/src/javaRestTest/java/org/elasticsearch/test/esql/EsqlPartialResultsIT.java
@mark-vieira mark-vieira requested a review from a team as a code owner March 27, 2025 00:14
@mark-vieira mark-vieira added auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport labels Mar 27, 2025
@elasticsearchmachine elasticsearchmachine merged commit 533d38d into elastic:9.0 Mar 27, 2025
16 checks passed
@mark-vieira mark-vieira deleted the backport/9.0/pr-125724 branch March 27, 2025 01:22
mark-vieira added a commit to mark-vieira/elasticsearch that referenced this pull request Mar 27, 2025
…) (elastic#125742)

* Convert `:test` projects to new testing framework (elastic#125724)

(cherry picked from commit e149a3e)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java
#	test/external-modules/error-query/build.gradle
#	test/external-modules/error-query/src/javaRestTest/java/org/elasticsearch/test/esql/EsqlPartialResultsIT.java

* Bump timeout

(cherry picked from commit 533d38d)

# Conflicts:
#	test/external-modules/error-query/build.gradle
mark-vieira added a commit to mark-vieira/elasticsearch that referenced this pull request Mar 27, 2025
…) (elastic#125742)

* Convert `:test` projects to new testing framework (elastic#125724)

(cherry picked from commit e149a3e)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java
#	test/external-modules/error-query/build.gradle
#	test/external-modules/error-query/src/javaRestTest/java/org/elasticsearch/test/esql/EsqlPartialResultsIT.java

* Bump timeout

(cherry picked from commit 533d38d)

# Conflicts:
#	test/external-modules/error-query/build.gradle
@mark-vieira
Copy link
Contributor Author

💚 All backports created successfully

Status Branch Result
8.x
8.18

Questions ?

Please refer to the Backport tool documentation

elasticsearchmachine pushed a commit that referenced this pull request Mar 27, 2025
…25742) (#125791)

* Convert `:test` projects to new testing framework (#125724)

(cherry picked from commit e149a3e)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java
#	test/external-modules/error-query/build.gradle
#	test/external-modules/error-query/src/javaRestTest/java/org/elasticsearch/test/esql/EsqlPartialResultsIT.java

* Bump timeout

(cherry picked from commit 533d38d)

# Conflicts:
#	test/external-modules/error-query/build.gradle
elasticsearchmachine pushed a commit that referenced this pull request Mar 27, 2025
… (#125742) (#125790)

* [9.0] Convert `:test` projects to new testing framework (#125724) (#125742)

* Convert `:test` projects to new testing framework (#125724)

(cherry picked from commit e149a3e)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/RestrictedBuildApiService.java
#	test/external-modules/error-query/build.gradle
#	test/external-modules/error-query/src/javaRestTest/java/org/elasticsearch/test/esql/EsqlPartialResultsIT.java

* Bump timeout

(cherry picked from commit 533d38d)

# Conflicts:
#	test/external-modules/error-query/build.gradle

* Don't use default distribution
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport v9.0.1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants