Pārlūkot izejas kodu

Enable dlm flag for more non-snapshot builds (#94220)

Andrei Dan 2 gadi atpakaļ
vecāks
revīzija
84fbfae3de

+ 11 - 0
modules/dlm/build.gradle

@@ -1,3 +1,5 @@
+import org.elasticsearch.gradle.internal.info.BuildParams
+
 apply plugin: 'elasticsearch.internal-es-plugin'
 apply plugin: 'elasticsearch.internal-cluster-test'
 
@@ -12,3 +14,12 @@ dependencies {
 }
 
 addQaCheckDependencies(project)
+
+if (BuildParams.isSnapshotBuild() == false) {
+  tasks.named("test").configure {
+    systemProperty 'es.dlm_feature_flag_enabled', 'true'
+  }
+  tasks.named("internalClusterTest").configure {
+    systemProperty 'es.dlm_feature_flag_enabled', 'true'
+  }
+}

+ 0 - 3
modules/dlm/src/test/java/org/elasticsearch/dlm/DataLifecycleServiceTests.java

@@ -87,7 +87,6 @@ public class DataLifecycleServiceTests extends ESTestCase {
     }
 
     public void testOperationsExecutedOnce() {
-        assumeTrue("https://github.com/elastic/elasticsearch/issues/94214", Boolean.parseBoolean(System.getProperty("build.snapshot")));
         String dataStreamName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT);
         int numBackingIndices = 3;
         Metadata.Builder builder = Metadata.builder();
@@ -120,7 +119,6 @@ public class DataLifecycleServiceTests extends ESTestCase {
     }
 
     public void testRetentionNotConfigured() {
-        assumeTrue("https://github.com/elastic/elasticsearch/issues/94214", Boolean.parseBoolean(System.getProperty("build.snapshot")));
         String dataStreamName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT);
         int numBackingIndices = 3;
         Metadata.Builder builder = Metadata.builder();
@@ -140,7 +138,6 @@ public class DataLifecycleServiceTests extends ESTestCase {
     }
 
     public void testRetentionNotExecutedDueToAge() {
-        assumeTrue("https://github.com/elastic/elasticsearch/issues/94214", Boolean.parseBoolean(System.getProperty("build.snapshot")));
         String dataStreamName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT);
         int numBackingIndices = 3;
         Metadata.Builder builder = Metadata.builder();