From 9cb0bb8b9f41ef9fa5c46e8fda608fcfd162dd2e Mon Sep 17 00:00:00 2001
From: Gordon Brown <gordon.brown@elastic.co>
Date: Thu, 18 Oct 2018 13:33:33 -0600
Subject: [PATCH] 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.
---
 x-pack/plugin/ilm/build.gradle                | 13 ++----------
 x-pack/plugin/ilm/qa/multi-node/build.gradle  | 20 +++++++++++++++++++
 .../TimeSeriesLifecycleActionsIT.java         |  0
 ...=> IndexLifecycleInitialisationTests.java} |  2 +-
 4 files changed, 23 insertions(+), 12 deletions(-)
 create mode 100644 x-pack/plugin/ilm/qa/multi-node/build.gradle
 rename x-pack/plugin/ilm/{ => qa/multi-node}/src/test/java/org/elasticsearch/xpack/indexlifecycle/TimeSeriesLifecycleActionsIT.java (100%)
 rename x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/indexlifecycle/{IndexLifecycleInitialisationIT.java => IndexLifecycleInitialisationTests.java} (99%)

diff --git a/x-pack/plugin/ilm/build.gradle b/x-pack/plugin/ilm/build.gradle
index 66836a45c97..5a41779c50f 100644
--- a/x-pack/plugin/ilm/build.gradle
+++ b/x-pack/plugin/ilm/build.gradle
@@ -19,18 +19,9 @@ dependencies {
 }
 
 check.dependsOn 'qa:with-security:integTestRunner'
+check.dependsOn 'qa:multi-node:integTestRunner'
 
-integTestCluster {
-    numNodes = 4
-    clusterName = 'ilm'
-    setting 'xpack.security.enabled', 'false'
-    setting 'xpack.watcher.enabled', 'false'
-    setting 'xpack.monitoring.enabled', 'false'
-    setting 'xpack.ml.enabled', 'false'
-    setting 'xpack.ilm.enabled', 'true'
-    setting 'indices.lifecycle.poll_interval', '2500ms'
-    module project(xpackModule('core'))
-}
+integTest.enabled = false
 
 run {
     plugin xpackModule('core')
diff --git a/x-pack/plugin/ilm/qa/multi-node/build.gradle b/x-pack/plugin/ilm/qa/multi-node/build.gradle
new file mode 100644
index 00000000000..d8dbb2f130f
--- /dev/null
+++ b/x-pack/plugin/ilm/qa/multi-node/build.gradle
@@ -0,0 +1,20 @@
+apply plugin: 'elasticsearch.standalone-rest-test'
+apply plugin: 'elasticsearch.rest-test'
+
+dependencies {
+    testCompile project(path: xpackProject('plugin').path, configuration: 'testArtifacts')
+}
+
+integTestCluster {
+    numNodes = 4
+    clusterName = 'ilm'
+    
+    setting 'xpack.ilm.enabled', 'true'
+    setting 'xpack.security.enabled', 'false'
+    setting 'xpack.watcher.enabled', 'false'
+    setting 'xpack.monitoring.enabled', 'false'
+    setting 'xpack.ml.enabled', 'false'
+    setting 'xpack.license.self_generated.type', 'trial'
+    setting 'indices.lifecycle.poll_interval', '2500ms'
+
+}
diff --git a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/indexlifecycle/TimeSeriesLifecycleActionsIT.java b/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/indexlifecycle/TimeSeriesLifecycleActionsIT.java
similarity index 100%
rename from x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/indexlifecycle/TimeSeriesLifecycleActionsIT.java
rename to x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/indexlifecycle/TimeSeriesLifecycleActionsIT.java
diff --git a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/indexlifecycle/IndexLifecycleInitialisationIT.java b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/indexlifecycle/IndexLifecycleInitialisationTests.java
similarity index 99%
rename from x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/indexlifecycle/IndexLifecycleInitialisationIT.java
rename to x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/indexlifecycle/IndexLifecycleInitialisationTests.java
index 423b7976190..fc8598de65f 100644
--- a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/indexlifecycle/IndexLifecycleInitialisationIT.java
+++ b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/indexlifecycle/IndexLifecycleInitialisationTests.java
@@ -72,7 +72,7 @@ import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsNull.nullValue;
 
 @ESIntegTestCase.ClusterScope(scope = Scope.TEST, numDataNodes = 0)
-public class IndexLifecycleInitialisationIT extends ESIntegTestCase {
+public class IndexLifecycleInitialisationTests extends ESIntegTestCase {
     private Settings settings;
     private LifecyclePolicy lifecyclePolicy;
     private Phase mockPhase;