From 0542a9eb925715d164e6c7baaffddd2ab56e0f24 Mon Sep 17 00:00:00 2001 From: Dimitrios Athanasiou Date: Thu, 2 Mar 2017 17:01:05 +0000 Subject: [PATCH] [TEST] Disable ml in qa modules where necessary Original commit: elastic/x-pack-elasticsearch@bb311b44d7289ec94b62a1f10d64a51c20d40b49 --- qa/core-rest-tests-with-security/build.gradle | 1 + qa/reindex-tests-with-security/build.gradle | 1 + qa/security-client-tests/build.gradle | 1 + qa/security-example-extension/build.gradle | 1 + qa/smoke-test-plugins-ssl/build.gradle | 2 ++ qa/smoke-test-watcher/build.gradle | 1 + qa/tribe-tests-with-license/build.gradle | 5 +++++ qa/tribe-tests-with-security/build.gradle | 2 ++ 8 files changed, 14 insertions(+) diff --git a/qa/core-rest-tests-with-security/build.gradle b/qa/core-rest-tests-with-security/build.gradle index 86ead2e5bc5..16b4fc0cec7 100644 --- a/qa/core-rest-tests-with-security/build.gradle +++ b/qa/core-rest-tests-with-security/build.gradle @@ -24,6 +24,7 @@ integTestCluster { plugin ':x-pack-elasticsearch:plugin' setting 'xpack.watcher.enabled', 'false' setting 'xpack.monitoring.enabled', 'false' + setting 'xpack.ml.enabled', 'false' setupCommand 'setupDummyUser', 'bin/x-pack/users', 'useradd', 'test_user', '-p', 'changeme', '-r', 'superuser' waitCondition = { node, ant -> diff --git a/qa/reindex-tests-with-security/build.gradle b/qa/reindex-tests-with-security/build.gradle index bbf8b0f0763..0bc961617bf 100644 --- a/qa/reindex-tests-with-security/build.gradle +++ b/qa/reindex-tests-with-security/build.gradle @@ -12,6 +12,7 @@ integTestCluster { plugin ':x-pack-elasticsearch:plugin' // Whitelist reindexing from the local node so we can test it. setting 'reindex.remote.whitelist', '127.0.0.1:*' + setting 'xpack.ml.enabled', 'false' extraConfigFile 'x-pack/roles.yml', 'roles.yml' [ test_admin: 'superuser', diff --git a/qa/security-client-tests/build.gradle b/qa/security-client-tests/build.gradle index f5b84abd35b..a0604ce1cf9 100644 --- a/qa/security-client-tests/build.gradle +++ b/qa/security-client-tests/build.gradle @@ -20,6 +20,7 @@ integTestRunner { integTestCluster { plugin ':x-pack-elasticsearch:plugin' + setting 'xpack.ml.enabled', 'false' setupCommand 'setupDummyUser', 'bin/x-pack/users', 'useradd', 'test_user', '-p', 'changeme', '-r', 'superuser' setupCommand 'setupTransportClientUser', diff --git a/qa/security-example-extension/build.gradle b/qa/security-example-extension/build.gradle index 35e2278cf88..86d1baea2da 100644 --- a/qa/security-example-extension/build.gradle +++ b/qa/security-example-extension/build.gradle @@ -59,6 +59,7 @@ integTestCluster { setting 'xpack.security.authc.realms.esusers.type', 'file' setting 'xpack.security.authc.realms.native.type', 'native' setting 'xpack.security.authc.realms.native.order', '2' + setting 'xpack.ml.enabled', 'false' setupCommand 'setupDummyUser', 'bin/x-pack/users', 'useradd', 'test_user', '-p', 'changeme', '-r', 'superuser' diff --git a/qa/smoke-test-plugins-ssl/build.gradle b/qa/smoke-test-plugins-ssl/build.gradle index 90d747aeeeb..932b439c44d 100644 --- a/qa/smoke-test-plugins-ssl/build.gradle +++ b/qa/smoke-test-plugins-ssl/build.gradle @@ -174,6 +174,8 @@ integTestCluster { setting 'xpack.security.http.ssl.keystore.path', nodeKeystore.name setting 'xpack.security.http.ssl.keystore.password', 'keypass' + setting 'xpack.ml.enabled', 'false' + plugin ':x-pack-elasticsearch:plugin' // copy keystores into config/ diff --git a/qa/smoke-test-watcher/build.gradle b/qa/smoke-test-watcher/build.gradle index 9556fe2bb90..c7abfb8c40a 100644 --- a/qa/smoke-test-watcher/build.gradle +++ b/qa/smoke-test-watcher/build.gradle @@ -21,6 +21,7 @@ integTestCluster { plugin ':x-pack-elasticsearch:plugin' setting 'xpack.security.enabled', 'false' setting 'xpack.monitoring.enabled', 'false' + setting 'xpack.ml.enabled', 'false' setting 'http.port', '9400' // Need to allow more compilations per minute because of the integration tests setting 'script.max_compilations_per_minute', '100' diff --git a/qa/tribe-tests-with-license/build.gradle b/qa/tribe-tests-with-license/build.gradle index ce8765a4ab7..eb5373abc0a 100644 --- a/qa/tribe-tests-with-license/build.gradle +++ b/qa/tribe-tests-with-license/build.gradle @@ -20,6 +20,7 @@ cluster1Config.setting('xpack.monitoring.enabled', false) cluster1Config.setting('xpack.security.enabled', false) cluster1Config.setting('xpack.watcher.enabled', false) cluster1Config.setting('xpack.graph.enabled', false) +cluster1Config.setting('xpack.ml.enabled', false) List cluster1Nodes = ClusterFormationTasks.setup(project, 'clusterOne', integTestRunner, cluster1Config) @@ -33,6 +34,7 @@ cluster2Config.setting('xpack.monitoring.enabled', false) cluster2Config.setting('xpack.security.enabled', false) cluster2Config.setting('xpack.watcher.enabled', false) cluster2Config.setting('xpack.graph.enabled', false) +cluster2Config.setting('xpack.ml.enabled', false) List cluster2Nodes = ClusterFormationTasks.setup(project, 'clusterTwo', integTestRunner, cluster2Config) @@ -47,6 +49,7 @@ integTestCluster { setting 'tribe.cluster1.xpack.security.enabled', false setting 'tribe.cluster1.xpack.watcher.enabled', false setting 'tribe.cluster1.xpack.graph.enabled', false + setting 'tribe.cluster1.xpack.ml.enabled', false setting 'tribe.cluster2.cluster.name', 'cluster2' setting 'tribe.cluster2.discovery.zen.ping.unicast.hosts', "'${-> cluster2Nodes.get(0).transportUri()}'" setting 'tribe.cluster2.http.enabled', 'true' @@ -55,6 +58,7 @@ integTestCluster { setting 'tribe.cluster2.xpack.security.enabled', false setting 'tribe.cluster2.xpack.watcher.enabled', false setting 'tribe.cluster2.xpack.graph.enabled', false + setting 'tribe.cluster2.xpack.ml.enabled', false // x-pack plugin ':x-pack-elasticsearch:plugin' setting 'xpack.monitoring.enabled', false @@ -62,6 +66,7 @@ integTestCluster { setting 'xpack.security.enabled', false setting 'xpack.watcher.enabled', false setting 'xpack.graph.enabled', false + setting 'xpack.ml.enabled', false } integTestRunner { diff --git a/qa/tribe-tests-with-security/build.gradle b/qa/tribe-tests-with-security/build.gradle index e4dc9f6b7c9..c5bf4f9014e 100644 --- a/qa/tribe-tests-with-security/build.gradle +++ b/qa/tribe-tests-with-security/build.gradle @@ -61,9 +61,11 @@ integTestCluster { setting 'tribe.cluster1.cluster.name', 'cluster1' setting 'tribe.cluster1.discovery.zen.ping.unicast.hosts', "'${-> cluster1Nodes.get(0).transportUri()}'" setting 'tribe.cluster1.http.enabled', 'true' + setting 'tribe.cluster1.xpack.ml.enabled', 'false' setting 'tribe.cluster2.cluster.name', 'cluster2' setting 'tribe.cluster2.discovery.zen.ping.unicast.hosts', "'${-> cluster2Nodes.get(0).transportUri()}'" setting 'tribe.cluster2.http.enabled', 'true' + setting 'tribe.cluster2.xpack.ml.enabled', 'false' waitCondition = { node, ant -> File tmpFile = new File(node.cwd, 'wait.success') ant.get(src: "http://${node.httpUri()}",