Merge branch 'main' into fix-propagateinlineevals-tests

alex-spies · web-flow · commit 2aa2071a21ac · 2025-03-14T15:43:20.000+01:00
diff --git a/muted-tests.yml b/muted-tests.yml
@@ -360,6 +360,9 @@ tests:
 - class: org.elasticsearch.datastreams.lifecycle.ExplainDataStreamLifecycleIT
   method: testSystemExplainLifecycle
   issue: https://github.com/elastic/elasticsearch/issues/124885
+- class: org.elasticsearch.xpack.ilm.DataStreamAndIndexLifecycleMixingTests
+  method: testIndexTemplateSwapsILMForDataStreamLifecycle
+  issue: https://github.com/elastic/elasticsearch/issues/124886
 
 # Examples:
 #

Original file line number	Diff line number	Diff line change
`@@ -360,6 +360,9 @@ tests:`
`360`	`360`	`- class: org.elasticsearch.datastreams.lifecycle.ExplainDataStreamLifecycleIT`
`361`	`361`	`method: testSystemExplainLifecycle`
`362`	`362`	`issue: https://github.com/elastic/elasticsearch/issues/124885`
	`363`	`+- class: org.elasticsearch.xpack.ilm.DataStreamAndIndexLifecycleMixingTests`
	`364`	`+ method: testIndexTemplateSwapsILMForDataStreamLifecycle`
	`365`	`+ issue: https://github.com/elastic/elasticsearch/issues/124886`
`363`	`366`
`364`	`367`	`# Examples:`
`365`	`368`	`#`