From e761b76765c2888c27ad398097a0df76a09060bc Mon Sep 17 00:00:00 2001 From: Colin Goodheart-Smithe Date: Wed, 8 Feb 2017 16:58:55 +0000 Subject: [PATCH] Migrates QA files Original commit: elastic/x-pack-elasticsearch@ac651f51d4352ee6b8699fa5aa94081e514f45b9 --- qa/basic-multi-node/build.gradle | 14 -------------- qa/build.gradle | 0 qa/ml-basic-multi-node/build.gradle | 16 ++++++++++++++++ .../xpack/ml/integration/MlBasicMultiNodeIT.java | 0 qa/ml-disabled/build.gradle | 5 +++-- qa/ml-no-bootstrap-tests/build.gradle | 6 ++++++ .../utils/NamedPipeHelperNoBootstrapTests.java | 0 .../build.gradle | 6 ++++-- .../ml/transforms/PainlessDomainSplitIT.java | 0 qa/no-bootstrap-tests/build.gradle | 6 ------ 10 files changed, 29 insertions(+), 24 deletions(-) delete mode 100644 qa/basic-multi-node/build.gradle delete mode 100644 qa/build.gradle create mode 100644 qa/ml-basic-multi-node/build.gradle rename qa/{basic-multi-node => ml-basic-multi-node}/src/test/java/org/elasticsearch/xpack/ml/integration/MlBasicMultiNodeIT.java (100%) create mode 100644 qa/ml-no-bootstrap-tests/build.gradle rename qa/{no-bootstrap-tests => ml-no-bootstrap-tests}/src/test/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelperNoBootstrapTests.java (100%) rename qa/{single-node-tests => ml-single-node-tests}/build.gradle (59%) rename qa/{single-node-tests => ml-single-node-tests}/src/test/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java (100%) delete mode 100644 qa/no-bootstrap-tests/build.gradle diff --git a/qa/basic-multi-node/build.gradle b/qa/basic-multi-node/build.gradle deleted file mode 100644 index b3307b2d841..00000000000 --- a/qa/basic-multi-node/build.gradle +++ /dev/null @@ -1,14 +0,0 @@ -apply plugin: 'elasticsearch.standalone-rest-test' -apply plugin: 'elasticsearch.rest-test' - -dependencies { - testCompile project(path: ':prelert-legacy:elasticsearch', configuration: 'runtime') -} - -integTest { - cluster { - numNodes = 3 - distribution = 'zip' - plugin ':prelert-legacy:elasticsearch' - } -} diff --git a/qa/build.gradle b/qa/build.gradle deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/ml-basic-multi-node/build.gradle b/qa/ml-basic-multi-node/build.gradle new file mode 100644 index 00000000000..a8990596744 --- /dev/null +++ b/qa/ml-basic-multi-node/build.gradle @@ -0,0 +1,16 @@ +apply plugin: 'elasticsearch.standalone-rest-test' +apply plugin: 'elasticsearch.rest-test' + +dependencies { + testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime') +} + +integTest { + cluster { + setting 'xpack.security.enabled', 'false' + setting 'xpack.ml.enabled', 'true' + numNodes = 3 + distribution = 'zip' + plugin ':x-pack:elasticsearch' + } +} diff --git a/qa/basic-multi-node/src/test/java/org/elasticsearch/xpack/ml/integration/MlBasicMultiNodeIT.java b/qa/ml-basic-multi-node/src/test/java/org/elasticsearch/xpack/ml/integration/MlBasicMultiNodeIT.java similarity index 100% rename from qa/basic-multi-node/src/test/java/org/elasticsearch/xpack/ml/integration/MlBasicMultiNodeIT.java rename to qa/ml-basic-multi-node/src/test/java/org/elasticsearch/xpack/ml/integration/MlBasicMultiNodeIT.java diff --git a/qa/ml-disabled/build.gradle b/qa/ml-disabled/build.gradle index cc64633a1cd..54f00ec41ea 100644 --- a/qa/ml-disabled/build.gradle +++ b/qa/ml-disabled/build.gradle @@ -2,14 +2,15 @@ apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.rest-test' dependencies { - testCompile project(path: ':prelert-legacy:elasticsearch', configuration: 'runtime') + testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime') } integTest { cluster { + setting 'xpack.security.enabled', 'false' setting 'xpack.ml.enabled', 'false' numNodes = 1 distribution = 'zip' - plugin ':prelert-legacy:elasticsearch' + plugin ':x-pack:elasticsearch' } } diff --git a/qa/ml-no-bootstrap-tests/build.gradle b/qa/ml-no-bootstrap-tests/build.gradle new file mode 100644 index 00000000000..58ee982d0ab --- /dev/null +++ b/qa/ml-no-bootstrap-tests/build.gradle @@ -0,0 +1,6 @@ +apply plugin: 'elasticsearch.standalone-test' + +dependencies { + testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime') +} + diff --git a/qa/no-bootstrap-tests/src/test/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelperNoBootstrapTests.java b/qa/ml-no-bootstrap-tests/src/test/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelperNoBootstrapTests.java similarity index 100% rename from qa/no-bootstrap-tests/src/test/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelperNoBootstrapTests.java rename to qa/ml-no-bootstrap-tests/src/test/java/org/elasticsearch/xpack/ml/utils/NamedPipeHelperNoBootstrapTests.java diff --git a/qa/single-node-tests/build.gradle b/qa/ml-single-node-tests/build.gradle similarity index 59% rename from qa/single-node-tests/build.gradle rename to qa/ml-single-node-tests/build.gradle index baf6b987ba3..6defec67101 100644 --- a/qa/single-node-tests/build.gradle +++ b/qa/ml-single-node-tests/build.gradle @@ -2,14 +2,16 @@ apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.rest-test' dependencies { - testCompile project(path: ':prelert-legacy:elasticsearch', configuration: 'runtime') + testCompile project(path: ':x-pack:elasticsearch', configuration: 'runtime') testCompile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.8.6' } integTest { cluster { + setting 'xpack.security.enabled', 'false' + setting 'xpack.ml.enabled', 'true' setting 'script.inline', 'true' distribution = 'zip' - plugin ':prelert-legacy:elasticsearch' + plugin ':x-pack:elasticsearch' } } diff --git a/qa/single-node-tests/src/test/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java b/qa/ml-single-node-tests/src/test/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java similarity index 100% rename from qa/single-node-tests/src/test/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java rename to qa/ml-single-node-tests/src/test/java/org/elasticsearch/xpack/ml/transforms/PainlessDomainSplitIT.java diff --git a/qa/no-bootstrap-tests/build.gradle b/qa/no-bootstrap-tests/build.gradle deleted file mode 100644 index 517c30ef996..00000000000 --- a/qa/no-bootstrap-tests/build.gradle +++ /dev/null @@ -1,6 +0,0 @@ -apply plugin: 'elasticsearch.standalone-test' - -dependencies { - testCompile project(path: ':prelert-legacy:elasticsearch', configuration: 'runtime') -} -