root
/
elasticsearch
mirror of https://github.com/elastic/elasticsearch.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Set feature flags for IndexTemplatesV2 and Data Streams in top… (#53897) 

Resolves #53892
This commit is contained in:
Lee Hinman 2020-03-20 15:11:49 -06:00 committed by GitHub
parent 290d58b1b0
commit 984670b34d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.gradle
View File

@ -545,3 +545,15 @@ allprojects {
} }
} }
} }
// TODO: remove this once 7.7 is released and the 7.x branch is 7.8
subprojects {
pluginManager.withPlugin('elasticsearch.testclusters') {
testClusters.all {
if (org.elasticsearch.gradle.info.BuildParams.isSnapshotBuild() == false) {
systemProperty 'es.itv2_feature_flag_registered', 'true'
systemProperty 'es.datastreams_feature_flag_registered', 'true'
}
}
}
}

8
distribution/archives/integ-test-zip/build.gradle
View File

@ -1,4 +1,3 @@
import org.elasticsearch.gradle.info.BuildParams
/* /*
* Licensed to Elasticsearch under one or more contributor * Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with * license agreements. See the NOTICE file distributed with
@ -33,10 +32,3 @@ integTest.runner {
systemProperty 'tests.logfile', '--external--' systemProperty 'tests.logfile', '--external--'
} }
} }
testClusters.integTest {
if (BuildParams.isSnapshotBuild() == false) {
systemProperty 'es.itv2_feature_flag_registered', 'true'
systemProperty 'es.datastreams_feature_flag_registered', 'true'
}
}

10
qa/smoke-test-multinode/build.gradle
View File

@ -16,9 +16,6 @@
* specific language governing permissions and limitations * specific language governing permissions and limitations
* under the License. * under the License.
*/ */
import org.elasticsearch.gradle.info.BuildParams
import org.elasticsearch.gradle.info.BuildParams
apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.testclusters'
apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.standalone-rest-test'
@ -49,10 +46,3 @@ integTest.runner {
].join(',') ].join(',')
} }
} }
testClusters.integTest {
if (BuildParams.isSnapshotBuild() == false) {
systemProperty 'es.itv2_feature_flag_registered', 'true'
systemProperty 'es.datastreams_feature_flag_registered', 'true'
}
}

6
server/src/main/java/org/elasticsearch/action/ActionModule.java
View File

@ -381,9 +381,6 @@ public class ActionModule extends AbstractModule {
static { static {
final String property = System.getProperty("es.itv2_feature_flag_registered"); final String property = System.getProperty("es.itv2_feature_flag_registered");
if (Build.CURRENT.isSnapshot() && property != null) {
throw new IllegalArgumentException("es.itv2_feature_flag_registered is only supported in non-snapshot builds");
}
if (Build.CURRENT.isSnapshot() || "true".equals(property)) { if (Build.CURRENT.isSnapshot() || "true".equals(property)) {
ITV2_FEATURE_FLAG_REGISTERED = true; ITV2_FEATURE_FLAG_REGISTERED = true;
} else if ("false".equals(property) || property == null) { } else if ("false".equals(property) || property == null) {
@ -398,9 +395,6 @@ public class ActionModule extends AbstractModule {
static { static {
final String property = System.getProperty("es.datastreams_feature_flag_registered"); final String property = System.getProperty("es.datastreams_feature_flag_registered");
if (Build.CURRENT.isSnapshot() && property != null) {
throw new IllegalArgumentException("es.datastreams_feature_flag_registered is only supported in non-snapshot builds");
}
if (Build.CURRENT.isSnapshot() || "true".equals(property)) { if (Build.CURRENT.isSnapshot() || "true".equals(property)) {
DATASTREAMS_FEATURE_FLAG_REGISTERED = true; DATASTREAMS_FEATURE_FLAG_REGISTERED = true;
} else if ("false".equals(property) || property == null) { } else if ("false".equals(property) || property == null) {

9
x-pack/qa/core-rest-tests-with-security/build.gradle
View File

@ -1,5 +1,3 @@
import org.elasticsearch.gradle.info.BuildParams
apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.testclusters'
apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.standalone-rest-test'
apply plugin: 'elasticsearch.rest-test' apply plugin: 'elasticsearch.rest-test'
@ -39,10 +37,3 @@ testClusters.integTest {
user username: System.getProperty('tests.rest.cluster.username', 'test_user'), user username: System.getProperty('tests.rest.cluster.username', 'test_user'),
password: System.getProperty('tests.rest.cluster.password', 'x-pack-test-password') password: System.getProperty('tests.rest.cluster.password', 'x-pack-test-password')
} }
testClusters.integTest {
if (BuildParams.isSnapshotBuild() == false) {
systemProperty 'es.itv2_feature_flag_registered', 'true'
systemProperty 'es.datastreams_feature_flag_registered', 'true'
}
}