Skip to content

Conversation

@mosche
Copy link
Contributor

@mosche mosche commented Oct 17, 2025

I'll follow up consolidating the projects in another PR. This felt easier to review if migrating in place.

Relates to ES-11813

@mosche mosche requested a review from a team October 17, 2025 10:08
@mosche mosche requested a review from a team as a code owner October 17, 2025 10:08
@mosche mosche added >test Issues or PRs that are addressing/adding tests :Core/Infra/Core Core issues without another label >refactoring labels Oct 17, 2025
@elasticsearchmachine elasticsearchmachine added v9.3.0 Team:Core/Infra Meta label for core/infra team labels Oct 17, 2025
@elasticsearchmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra (Team:Core/Infra)

@mosche mosche marked this pull request as draft October 17, 2025 14:33
@mosche mosche marked this pull request as ready for review October 20, 2025 13:28
@mosche mosche added auto-backport Automatically create backport pull requests when merged v8.19.6 v9.1.6 v9.2.1 labels Oct 20, 2025
}

tasks.named("check").configure { dependsOn 'follow-cluster' }
if (buildParams.inFipsJvm) {
Copy link
Contributor

Choose a reason for hiding this comment

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

We have a utility for this:

tasks.named("javaRestTest") {
  buildParams.withFipsEnabledOnly(it)
}

public static TemporaryFolder repoDir = new TemporaryFolder();

public static ElasticsearchCluster leaderCluster = ElasticsearchCluster.local()
.module("x-pack-ilm")
Copy link
Contributor

Choose a reason for hiding this comment

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

For multi-cluster tests it's generally good practice to give them unique names. The default is "test-cluster" but you can use name() to customize this. This can be helpful when analyzing the logs, since the node nodes use the cluster name as a prefix. That way you can see leader-1 and follower-1 in the test output vs just test-cluster-n and have to figure out which cluster it is.

@ClassRule
public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
.module("x-pack-ilm")
.setting("xpack.ml.enabled", "false")
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this setting still necessary if we aren't including the ML module?

@mosche mosche added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Oct 23, 2025
@elasticsearchmachine elasticsearchmachine merged commit 440faee into elastic:main Oct 23, 2025
34 checks passed
@mosche mosche deleted the tests/migrate_ilm branch October 23, 2025 16:32
@elasticsearchmachine
Copy link
Collaborator

💔 Backport failed

Status Branch Result
9.2 Commit could not be cherrypicked due to conflicts
8.19 Commit could not be cherrypicked due to conflicts
9.1 Commit could not be cherrypicked due to conflicts

You can use sqren/backport to manually backport by running backport --upstream elastic/elasticsearch --pr 136744

mosche added a commit to mosche/elasticsearch that referenced this pull request Oct 24, 2025
I'll follow up consolidating the projects in another PR. This felt
easier to review if migrating in place.

Relates to ES-11813

(cherry picked from commit 440faee)

# Conflicts:
#	x-pack/plugin/ilm/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/ilm/CCRIndexLifecycleIT.java
#	x-pack/plugin/ilm/qa/multi-node/build.gradle
#	x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/actions/SearchableSnapshotActionIT.java
mosche added a commit to mosche/elasticsearch that referenced this pull request Oct 24, 2025
I'll follow up consolidating the projects in another PR. This felt
easier to review if migrating in place.

Relates to ES-11813

(cherry picked from commit 440faee)

# Conflicts:
#	x-pack/plugin/ilm/qa/multi-cluster/build.gradle
#	x-pack/plugin/ilm/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/ilm/CCRIndexLifecycleIT.java
#	x-pack/plugin/ilm/qa/multi-node/build.gradle
#	x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/actions/SearchableSnapshotActionIT.java
#	x-pack/plugin/ilm/qa/rest/build.gradle
#	x-pack/plugin/ilm/qa/with-security/build.gradle
@mosche
Copy link
Contributor Author

mosche commented Oct 24, 2025

💚 All backports created successfully

Status Branch Result
9.1
8.19

Questions ?

Please refer to the Backport tool documentation

@mosche
Copy link
Contributor Author

mosche commented Oct 24, 2025

💚 All backports created successfully

Status Branch Result
9.2

Questions ?

Please refer to the Backport tool documentation

mosche added a commit to mosche/elasticsearch that referenced this pull request Oct 24, 2025
I'll follow up consolidating the projects in another PR. This felt
easier to review if migrating in place.

Relates to ES-11813

(cherry picked from commit 440faee)

# Conflicts:
#	x-pack/plugin/ilm/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/ilm/CCRIndexLifecycleIT.java
elasticsearchmachine pushed a commit that referenced this pull request Oct 24, 2025
* Migrate ILM REST tests to new test framework. (#136744)

I'll follow up consolidating the projects in another PR. This felt
easier to review if migrating in place.

Relates to ES-11813

(cherry picked from commit 440faee)

# Conflicts:
#	x-pack/plugin/ilm/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/ilm/CCRIndexLifecycleIT.java
#	x-pack/plugin/ilm/qa/multi-node/build.gradle
#	x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/actions/SearchableSnapshotActionIT.java

* [CI] Auto commit changes from spotless

---------

Co-authored-by: elasticsearchmachine <[email protected]>
elasticsearchmachine pushed a commit that referenced this pull request Oct 24, 2025
* Migrate ILM REST tests to new test framework. (#136744)

I'll follow up consolidating the projects in another PR. This felt
easier to review if migrating in place.

Relates to ES-11813

(cherry picked from commit 440faee)

# Conflicts:
#	x-pack/plugin/ilm/qa/multi-cluster/build.gradle
#	x-pack/plugin/ilm/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/ilm/CCRIndexLifecycleIT.java
#	x-pack/plugin/ilm/qa/multi-node/build.gradle
#	x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/actions/SearchableSnapshotActionIT.java
#	x-pack/plugin/ilm/qa/rest/build.gradle
#	x-pack/plugin/ilm/qa/with-security/build.gradle

* [CI] Auto commit changes from spotless

* fix

---------

Co-authored-by: elasticsearchmachine <[email protected]>
elasticsearchmachine pushed a commit that referenced this pull request Oct 24, 2025
* Migrate ILM REST tests to new test framework. (#136744)

I'll follow up consolidating the projects in another PR. This felt
easier to review if migrating in place.

Relates to ES-11813

(cherry picked from commit 440faee)

# Conflicts:
#	x-pack/plugin/ilm/qa/multi-cluster/src/javaRestTest/java/org/elasticsearch/xpack/ilm/CCRIndexLifecycleIT.java

* [CI] Auto commit changes from spotless

---------

Co-authored-by: elasticsearchmachine <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-backport Automatically create backport pull requests when merged auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport pending :Core/Infra/Core Core issues without another label >refactoring Team:Core/Infra Meta label for core/infra team >test Issues or PRs that are addressing/adding tests v8.19.7 v9.1.7 v9.2.1 v9.3.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants