Skip to content

Commit 9cb0bb8

Browse files
authored
Rework ILM build to separate integration tests (#34617)
Having integration tests separated from the unit tests in the qa directory works much more smoothly with our testing infrastructure, matches what other plugins do, and tests in a more "real" deployment scenario by having all plugins installed.
1 parent 09067c8 commit 9cb0bb8

File tree

4 files changed

+23
-12
lines changed

4 files changed

+23
-12
lines changed

x-pack/plugin/ilm/build.gradle

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,9 @@ dependencies {
1919
}
2020

2121
check.dependsOn 'qa:with-security:integTestRunner'
22+
check.dependsOn 'qa:multi-node:integTestRunner'
2223

23-
integTestCluster {
24-
numNodes = 4
25-
clusterName = 'ilm'
26-
setting 'xpack.security.enabled', 'false'
27-
setting 'xpack.watcher.enabled', 'false'
28-
setting 'xpack.monitoring.enabled', 'false'
29-
setting 'xpack.ml.enabled', 'false'
30-
setting 'xpack.ilm.enabled', 'true'
31-
setting 'indices.lifecycle.poll_interval', '2500ms'
32-
module project(xpackModule('core'))
33-
}
24+
integTest.enabled = false
3425

3526
run {
3627
plugin xpackModule('core')
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
apply plugin: 'elasticsearch.standalone-rest-test'
2+
apply plugin: 'elasticsearch.rest-test'
3+
4+
dependencies {
5+
testCompile project(path: xpackProject('plugin').path, configuration: 'testArtifacts')
6+
}
7+
8+
integTestCluster {
9+
numNodes = 4
10+
clusterName = 'ilm'
11+
12+
setting 'xpack.ilm.enabled', 'true'
13+
setting 'xpack.security.enabled', 'false'
14+
setting 'xpack.watcher.enabled', 'false'
15+
setting 'xpack.monitoring.enabled', 'false'
16+
setting 'xpack.ml.enabled', 'false'
17+
setting 'xpack.license.self_generated.type', 'trial'
18+
setting 'indices.lifecycle.poll_interval', '2500ms'
19+
20+
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
import static org.hamcrest.core.IsNull.nullValue;
7373

7474
@ESIntegTestCase.ClusterScope(scope = Scope.TEST, numDataNodes = 0)
75-
public class IndexLifecycleInitialisationIT extends ESIntegTestCase {
75+
public class IndexLifecycleInitialisationTests extends ESIntegTestCase {
7676
private Settings settings;
7777
private LifecyclePolicy lifecyclePolicy;
7878
private Phase mockPhase;

0 commit comments

Comments
 (0)