From d918ef0da9f49b43cde422fa459a77724d75c4f0 Mon Sep 17 00:00:00 2001 From: Andrei Dan Date: Tue, 14 Apr 2020 16:13:39 +0100 Subject: [PATCH] [Tests] Enable searchable_snapshots for non-snapshot builds (#55151) (#55157) Fixes https://github.com/elastic/elasticsearch/issues/55050 (cherry picked from commit 13391ceff1cbf6db69706c5f46127b6ff8850a1f) Signed-off-by: Andrei Dan --- x-pack/plugin/ilm/qa/multi-node/build.gradle | 4 ++++ .../elasticsearch/xpack/ilm/TimeSeriesLifecycleActionsIT.java | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/x-pack/plugin/ilm/qa/multi-node/build.gradle b/x-pack/plugin/ilm/qa/multi-node/build.gradle index bb0c247b5c8..2a943127f6b 100644 --- a/x-pack/plugin/ilm/qa/multi-node/build.gradle +++ b/x-pack/plugin/ilm/qa/multi-node/build.gradle @@ -1,4 +1,5 @@ import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.info.BuildParams apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.standalone-rest-test' @@ -17,6 +18,9 @@ integTest.runner { testClusters.integTest { testDistribution = 'DEFAULT' + if (BuildParams.isSnapshotBuild() == false) { + systemProperty 'es.searchable_snapshots_feature_enabled', 'true' + } numberOfNodes = 4 setting 'path.repo', repoDir.absolutePath diff --git a/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/ilm/TimeSeriesLifecycleActionsIT.java b/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/ilm/TimeSeriesLifecycleActionsIT.java index 17cfd1ff4b5..57c5b2654f9 100644 --- a/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/ilm/TimeSeriesLifecycleActionsIT.java +++ b/x-pack/plugin/ilm/qa/multi-node/src/test/java/org/elasticsearch/xpack/ilm/TimeSeriesLifecycleActionsIT.java @@ -1558,7 +1558,6 @@ public class TimeSeriesLifecycleActionsIT extends ESRestTestCase { assertBusy(() -> assertFalse("expected " + index + " to be deleted by ILM", indexExists(index))); } - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/55050") public void testSearchableSnapshotAction() throws Exception { String snapshotRepo = createSnapshotRepo(); createNewSingletonPolicy("cold", new SearchableSnapshotAction(snapshotRepo));