From 371d6f182b0234f23d3adc7dca1c57c0bd5478b1 Mon Sep 17 00:00:00 2001 From: Steve Gordon Date: Wed, 16 Jun 2021 13:50:52 +0100 Subject: [PATCH] Reorder cleanup steps for YAML tests (#5729) (cherry picked from commit 6399e07e1c1738b0606fb7f05d10648266a6fb91) --- tests/Tests.YamlRunner/TestSuiteBootstrap.fs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/Tests.YamlRunner/TestSuiteBootstrap.fs b/tests/Tests.YamlRunner/TestSuiteBootstrap.fs index 784c9a6ed1b..2d7faa9474d 100644 --- a/tests/Tests.YamlRunner/TestSuiteBootstrap.fs +++ b/tests/Tests.YamlRunner/TestSuiteBootstrap.fs @@ -86,9 +86,8 @@ let DefaultSetup : Operation list = [Actions("Setup", fun (client, suite) -> let e = start.AddSeconds(30.) while (call() > 0 && DateTime.UtcNow < e) do ignore() - let waitForPendingRollupTasks () = waitForPendingTasks "xpack/rollup/job" - + let deleteAllSLMPolicies () = getAndDelete (fun _ -> client.SnapshotLifecycleManagement.GetSnapshotLifecycle()) @@ -233,12 +232,12 @@ let DefaultSetup : Operation list = [Actions("Setup", fun (client, suite) -> waitForPendingRollupTasks() yield! deleteAllSLMPolicies() - yield! wipeSnapshots() - if suite = Platinum then yield wipeDataStreams() yield wipeAllIndices() + + yield! wipeSnapshots() yield! wipeTemplateForXPack() @@ -266,5 +265,4 @@ let DefaultSetup : Operation list = [Actions("Setup", fun (client, suite) -> waitForClusterStateUpdatesToFinish() } - )]