[ML][TEST] Disable other plugins for internal cluster integ tests (elastic/x-pack-elasticsearch#4285)

ML internal cluster integration tests should not depend on any of
the other plugins. In addition, monitoring can interfere with
some of the tests, making them slower and more fragile. This
reverts a change that got in elastic/x-pack-elasticsearch#3643.

Relates elastic/x-pack-elasticsearch#4279

Original commit: elastic/x-pack-elasticsearch@340455c848
This commit is contained in:
Dimitris Athanasiou 2018-04-04 11:56:18 +01:00 committed by GitHub
parent 2da6d14859
commit aee8416649
1 changed files with 6 additions and 6 deletions

View File

@ -81,9 +81,9 @@ public abstract class BaseMlIntegTestCase extends ESIntegTestCase {
settings.put(XPackSettings.MACHINE_LEARNING_ENABLED.getKey(), true);
settings.put(XPackSettings.SECURITY_ENABLED.getKey(), false);
settings.put(LicenseService.SELF_GENERATED_LICENSE_TYPE.getKey(), "trial");
// settings.put(XPackSettings.WATCHER_ENABLED.getKey(), false);
// settings.put(XPackSettings.MONITORING_ENABLED.getKey(), false);
// settings.put(XPackSettings.GRAPH_ENABLED.getKey(), false);
settings.put(XPackSettings.WATCHER_ENABLED.getKey(), false);
settings.put(XPackSettings.MONITORING_ENABLED.getKey(), false);
settings.put(XPackSettings.GRAPH_ENABLED.getKey(), false);
return settings.build();
}
@ -92,9 +92,9 @@ public abstract class BaseMlIntegTestCase extends ESIntegTestCase {
Settings.Builder settings = Settings.builder().put(super.transportClientSettings());
settings.put(XPackSettings.MACHINE_LEARNING_ENABLED.getKey(), true);
settings.put(XPackSettings.SECURITY_ENABLED.getKey(), false);
// settings.put(XPackSettings.WATCHER_ENABLED.getKey(), false);
// settings.put(XPackSettings.MONITORING_ENABLED.getKey(), false);
// settings.put(XPackSettings.GRAPH_ENABLED.getKey(), false);
settings.put(XPackSettings.WATCHER_ENABLED.getKey(), false);
settings.put(XPackSettings.MONITORING_ENABLED.getKey(), false);
settings.put(XPackSettings.GRAPH_ENABLED.getKey(), false);
return settings.build();
}