|
@@ -3,32 +3,31 @@
|
|
|
* or more contributor license agreements. Licensed under the Elastic License;
|
|
|
* you may not use this file except in compliance with the Elastic License.
|
|
|
*/
|
|
|
+import org.elasticsearch.gradle.info.BuildParams
|
|
|
|
|
|
-apply plugin: 'elasticsearch.testclusters'
|
|
|
-apply plugin: 'elasticsearch.standalone-rest-test'
|
|
|
-apply plugin: 'elasticsearch.rest-test'
|
|
|
-apply plugin: 'elasticsearch.rest-resources'
|
|
|
+apply plugin: 'elasticsearch.yaml-rest-test'
|
|
|
|
|
|
-import org.elasticsearch.gradle.info.BuildParams
|
|
|
|
|
|
dependencies {
|
|
|
- testImplementation project(path: xpackModule('rollup'))
|
|
|
+ yamlRestTestImplementation project(path: xpackModule('rollup'))
|
|
|
}
|
|
|
|
|
|
restResources {
|
|
|
- restApi {
|
|
|
- includeCore '_common', 'bulk', 'cluster', 'indices', 'search'
|
|
|
- includeXpack 'rollup'
|
|
|
- }
|
|
|
+ restApi {
|
|
|
+ includeCore '_common', 'bulk', 'cluster', 'indices', 'search'
|
|
|
+ includeXpack 'rollup'
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+testClusters.all {
|
|
|
+ testDistribution = 'DEFAULT'
|
|
|
+ setting 'xpack.license.self_generated.type', 'basic'
|
|
|
+ systemProperty 'es.rollup_v2_feature_flag_enabled', 'true'
|
|
|
}
|
|
|
|
|
|
+tasks.named("test").configure{enabled = false }
|
|
|
+
|
|
|
if (BuildParams.inFipsJvm){
|
|
|
// This test cluster is using a BASIC license and FIPS 140 mode is not supported in BASIC
|
|
|
- tasks.named("integTest").configure{enabled = false }
|
|
|
- tasks.named("testingConventions").configure{enabled = false }
|
|
|
-}
|
|
|
-testClusters.matching { it.name == "integTest" }.configureEach {
|
|
|
- testDistribution = 'DEFAULT'
|
|
|
- setting 'xpack.license.self_generated.type', 'basic'
|
|
|
- systemProperty 'es.rollup_v2_feature_flag_enabled', 'true'
|
|
|
+ tasks.named("yamlRestTest").configure{enabled = false }
|
|
|
}
|