From 8c28f22b741af21aed6092f6f7909b875461ffb1 Mon Sep 17 00:00:00 2001
From: Salvatore Campagna
 <93581129+salvatore-campagna@users.noreply.github.com>
Date: Sun, 31 Mar 2024 01:05:07 +0100
Subject: [PATCH] Update mixed cluster test skip version for downsampling
 (#106942) (#106944)

All nodes on the mixed cluster need to be at least on version
8.10 since PR #97557 introduced execution of downsampling tasks
using the persisten task framework which is incompatible with
how execution was coordinated before.
---
 x-pack/plugin/downsample/qa/mixed-cluster/build.gradle     | 2 +-
 .../resources/rest-api-spec/test/downsample/10_basic.yml   | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/x-pack/plugin/downsample/qa/mixed-cluster/build.gradle b/x-pack/plugin/downsample/qa/mixed-cluster/build.gradle
index 2449991a8e1e0..61aa2927e46de 100644
--- a/x-pack/plugin/downsample/qa/mixed-cluster/build.gradle
+++ b/x-pack/plugin/downsample/qa/mixed-cluster/build.gradle
@@ -26,7 +26,7 @@ restResources {
 }
 
 def supportedVersion = bwcVersion -> {
-  return bwcVersion.onOrAfter("8.8.0");
+  return bwcVersion.onOrAfter("8.10.0");
 }
 
 BuildParams.bwcVersions.withWireCompatible(supportedVersion) { bwcVersion, baseName ->
diff --git a/x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml b/x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml
index 95c69efa5b36d..2362f21d77d86 100644
--- a/x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml
+++ b/x-pack/plugin/downsample/qa/mixed-cluster/src/yamlRestTest/resources/rest-api-spec/test/downsample/10_basic.yml
@@ -1,7 +1,7 @@
 setup:
   - skip:
-      version: " - 8.4.99"
-      reason: "rollup renamed to downsample in 8.5.0"
+      version: " - 8.9.99"
+      reason: "Downsampling executed using persistent task framework from version 8.10"
 
   - do:
       indices.create:
@@ -87,6 +87,9 @@ setup:
 
 ---
 "Downsample index":
+  - skip:
+      version: " - 8.9.99"
+      reason: "Downsampling executed using persistent task framework from version 8.10"
 
   - do:
       indices.downsample: