From 809d6ec08cf0038585c507b406e20cade456c0f6 Mon Sep 17 00:00:00 2001 From: jaymode Date: Fri, 16 Feb 2018 13:05:54 -0700 Subject: [PATCH] Test: use trial license for full cluster restart tests This updates the full cluster restart tests to use a trial license so that security and watcher functionality can be tested. This is needed as a result of changing the default license type to basic. Relates elastic/x-pack-elasticsearch#3878 relates elastic/x-pack-elasticsearch#3975 Original commit: elastic/x-pack-elasticsearch@f899d48449d2adefbbd8a9e60a3d70d1cd53e8c7 --- qa/full-cluster-restart/build.gradle | 2 ++ .../org/elasticsearch/xpack/restart/FullClusterRestartIT.java | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/full-cluster-restart/build.gradle b/qa/full-cluster-restart/build.gradle index fd5e5821faa..c753bf0ab4c 100644 --- a/qa/full-cluster-restart/build.gradle +++ b/qa/full-cluster-restart/build.gradle @@ -158,6 +158,7 @@ subprojects { setting 'xpack.security.transport.ssl.enabled', 'true' setting 'xpack.ssl.keystore.path', 'testnode.jks' setting 'xpack.ssl.keystore.password', 'testnode' + setting 'xpack.license.self_generated.type', 'trial' dependsOn copyTestNodeKeystore extraConfigFile 'testnode.jks', new File(outputDir + '/testnode.jks') if (withSystemKey) { @@ -207,6 +208,7 @@ subprojects { setting 'xpack.ssl.keystore.path', 'testnode.jks' keystoreSetting 'xpack.ssl.keystore.secure_password', 'testnode' + setting 'xpack.license.self_generated.type', 'trial' dependsOn copyTestNodeKeystore extraConfigFile 'testnode.jks', new File(outputDir + '/testnode.jks') if (withSystemKey) { diff --git a/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java b/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java index b825633bd24..d86806b4fe0 100644 --- a/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java +++ b/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/FullClusterRestartIT.java @@ -115,7 +115,6 @@ public class FullClusterRestartIT extends ESRestTestCase { } @SuppressWarnings("unchecked") - @AwaitsFix(bugUrl = "https://github.com/elastic/x-pack-elasticsearch/issues/3975") public void testSecurityNativeRealm() throws Exception { if (runningAgainstOldCluster) { createUser("preupgrade_user"); @@ -189,7 +188,6 @@ public class FullClusterRestartIT extends ESRestTestCase { waitForClusterStats(expectedVersion); } - @AwaitsFix(bugUrl = "https://github.com/elastic/x-pack-elasticsearch/issues/3975") public void testWatcher() throws Exception { if (runningAgainstOldCluster) { logger.info("Adding a watch on old cluster {}", oldClusterVersion);