Browse Source

TSDB: Add feature flag to more builds (#78619)

When we run the build in non-snapshot mode we don't enable feature flags
by default. This would cause the tests for tsdb to fail. So we enable
the tsdb feature flag in every build that needs it. There were a few
builds that needed it that didn't have it. This adds it to those builds.

Closes #78443
Closes #78598
Nik Everett 4 years ago
parent
commit
5de59aa988

+ 7 - 0
qa/multi-cluster-search/build.gradle

@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  * Side Public License, v 1.
  */
  */
 
 
+import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.internal.test.RestIntegTestTask
 import org.elasticsearch.gradle.internal.test.RestIntegTestTask
 
 
 apply plugin: 'elasticsearch.internal-testclusters'
 apply plugin: 'elasticsearch.internal-testclusters'
@@ -24,6 +25,12 @@ tasks.register('remote-cluster', RestIntegTestTask) {
   systemProperty 'tests.rest.suite', 'remote_cluster'
   systemProperty 'tests.rest.suite', 'remote_cluster'
 }
 }
 
 
+testClusters.configureEach {
+  if (BuildParams.isSnapshotBuild() == false) {
+    systemProperty 'es.index_mode_feature_flag_registered', 'true'
+  }
+}
+
 testClusters.matching{ it.name == 'remote-cluster' }.configureEach {
 testClusters.matching{ it.name == 'remote-cluster' }.configureEach {
   numberOfNodes = 2
   numberOfNodes = 2
   setting 'node.roles', '[data,ingest,master]'
   setting 'node.roles', '[data,ingest,master]'

+ 6 - 0
qa/rolling-upgrade/build.gradle

@@ -99,3 +99,9 @@ for (Version bwcVersion : BuildParams.bwcVersions.wireCompatible) {
     dependsOn tasks.named("${baseName}#upgradedClusterTest")
     dependsOn tasks.named("${baseName}#upgradedClusterTest")
   }
   }
 }
 }
+
+testClusters.configureEach {
+  if (BuildParams.isSnapshotBuild() == false) {
+    systemProperty 'es.index_mode_feature_flag_registered', 'true'
+  }
+}

+ 4 - 0
x-pack/plugin/build.gradle

@@ -218,6 +218,10 @@ testClusters.configureEach {
   extraConfigFile nodeKey.name, nodeKey
   extraConfigFile nodeKey.name, nodeKey
   extraConfigFile nodeCert.name, nodeCert
   extraConfigFile nodeCert.name, nodeCert
   extraConfigFile serviceTokens.name, serviceTokens
   extraConfigFile serviceTokens.name, serviceTokens
+
+  if (BuildParams.isSnapshotBuild() == false) {
+    systemProperty 'es.index_mode_feature_flag_registered', 'true'
+  }
 }
 }
 
 
 tasks.register('enforceApiSpecsConvention').configure {
 tasks.register('enforceApiSpecsConvention').configure {

+ 8 - 0
x-pack/plugin/ccr/qa/multi-cluster/build.gradle

@@ -1,3 +1,4 @@
+import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.internal.test.RestIntegTestTask
 import org.elasticsearch.gradle.internal.test.RestIntegTestTask
 
 
 apply plugin: 'elasticsearch.internal-testclusters'
 apply plugin: 'elasticsearch.internal-testclusters'
@@ -63,4 +64,11 @@ testClusters.matching {it.name == "follow-cluster" }.configureEach {
     { "\"${middleCluster.get().getAllTransportPortURI().join(",")}\"" }
     { "\"${middleCluster.get().getAllTransportPortURI().join(",")}\"" }
 }
 }
 
 
+
+testClusters.configureEach {
+  if (BuildParams.isSnapshotBuild() == false) {
+    systemProperty 'es.index_mode_feature_flag_registered', 'true'
+  }
+}
+
 tasks.named("check").configure { dependsOn "follow-cluster" }
 tasks.named("check").configure { dependsOn "follow-cluster" }

+ 2 - 2
x-pack/plugin/src/yamlRestTest/resources/rest-api-spec/test/analytics/histogram.yml

@@ -175,8 +175,8 @@ setup:
 ---
 ---
 histogram with time series mappings:
 histogram with time series mappings:
   - skip:
   - skip:
-      version: "all"
-      reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/78443"
+      version: " - 7.99.99"
+      reason: time series mode added in 8.0.0
 
 
   - do:
   - do: