From 3a7c95a9112d79321afe158486025936f6d79282 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Tue, 18 Jul 2023 21:19:31 -0500
Subject: [PATCH] Fix search pipeline bwc test (#8764) (#8765)

(cherry picked from commit 40c8a924cec5defb28181f3dbc4a940f31ece246)

Signed-off-by: Louis Chu <clingzhi@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 qa/mixed-cluster/build.gradle                 |  3 ---
 .../test/search_pipeline/10_basic.yml         | 20 +++++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/qa/mixed-cluster/build.gradle b/qa/mixed-cluster/build.gradle
index e24e4e17adcb6..90aeb8faadf80 100644
--- a/qa/mixed-cluster/build.gradle
+++ b/qa/mixed-cluster/build.gradle
@@ -64,9 +64,6 @@ for (Version bwcVersion : BuildParams.bwcVersions.wireCompatible) {
       numberOfNodes = 4
 
       setting 'path.repo', "${buildDir}/cluster/shared/repo/${baseName}"
-      if (bwcVersion.onOrAfter("2.7.0")) {
-        setting 'opensearch.experimental.feature.search_pipeline.enabled', 'true'
-      }
     }
   }
 
diff --git a/rest-api-spec/src/main/resources/rest-api-spec/test/search_pipeline/10_basic.yml b/rest-api-spec/src/main/resources/rest-api-spec/test/search_pipeline/10_basic.yml
index 60c0706415bc2..b7e6addff7ad4 100644
--- a/rest-api-spec/src/main/resources/rest-api-spec/test/search_pipeline/10_basic.yml
+++ b/rest-api-spec/src/main/resources/rest-api-spec/test/search_pipeline/10_basic.yml
@@ -1,8 +1,12 @@
 ---
+# Only send sanity request to nodes in >=2.9 versions because search pipeline is GA in 2.9.0.
+# Nodes from earlier versions (before 2.9.0) will submit the request to nodes from 2.9.0
+# or later during the "mixedClusterTest," but this will fail because 2.9.0 removed the feature flag setting.
+
 "Test basic pipeline crud":
   - skip:
-      version: " - 2.6.99"
-      reason: "Added in 2.7.0"
+      version: " - 2.8.99"
+      reason: "Only send sanity request to nodes in >=2.9 versions"
   - do:
       search_pipeline.put:
         id: "my_pipeline"
@@ -32,8 +36,8 @@
 ---
 "Test Put Versioned Pipeline":
   - skip:
-      version: " - 2.6.99"
-      reason: "Added in 2.7.0"
+      version: " - 2.8.99"
+      reason: "Only send sanity request to nodes in >=2.9 versions"
   - do:
       search_pipeline.put:
         id: "my_pipeline"
@@ -125,8 +129,8 @@
 ---
 "Test Get All Pipelines":
   - skip:
-      version: " - 2.6.99"
-      reason: "Added in 2.7.0"
+      version: " - 2.8.99"
+      reason: "Only send sanity request to nodes in >=2.9 versions"
   - do:
       search_pipeline.put:
         id: "first_pipeline"
@@ -152,8 +156,8 @@
 ---
 "Test invalid config":
   - skip:
-      version: " - 2.6.99"
-      reason: "Added in 2.7.0"
+      version: " - 2.8.99"
+      reason: "Only send sanity request to nodes in >=2.9 versions"
   - do:
       catch: /parse_exception/
       search_pipeline.put: