From a44383863161c82552bf27a4f6b106c48bf5a817 Mon Sep 17 00:00:00 2001
From: Thomas Farr <tsfarr@amazon.com>
Date: Tue, 24 Sep 2024 12:14:52 +1200
Subject: [PATCH] Enable search pipelines on 2.8.0

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
---
 .github/actions/run-released-opensearch/action.yml | 4 ++++
 .github/actions/start-opensearch/action.yml        | 8 ++++++--
 .github/workflows/integration-yaml-tests.yml       | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/actions/run-released-opensearch/action.yml b/.github/actions/run-released-opensearch/action.yml
index 34f1227f6f..c8b8b45a99 100644
--- a/.github/actions/run-released-opensearch/action.yml
+++ b/.github/actions/run-released-opensearch/action.yml
@@ -7,6 +7,9 @@ inputs:
   secured:
     description: Whether to enable the security plugin
     required: true
+  opensearch_args:
+    description: Additional arguments to pass to the OpenSearch process
+    default: ''
 outputs:
   opensearch_url:
     description: The URL where the OpenSearch node is accessible
@@ -49,4 +52,5 @@ runs:
       id: opensearch
       uses: ./client/.github/actions/start-opensearch
       with:
+        opensearch_args: ${{ inputs.opensearch_args }}
         secured: ${{ inputs.secured }}
diff --git a/.github/actions/start-opensearch/action.yml b/.github/actions/start-opensearch/action.yml
index 02dd2b613c..f2afd5783e 100644
--- a/.github/actions/start-opensearch/action.yml
+++ b/.github/actions/start-opensearch/action.yml
@@ -1,6 +1,9 @@
 name: Start OpenSearch
 description: Configures and starts an OpenSearch daemon
 inputs:
+  opensearch_args:
+    description: Additional arguments to pass to the OpenSearch process
+    default: ''
   secured:
     description: Whether to enable the security plugin
     default: 'false'
@@ -74,9 +77,9 @@ runs:
         fi
 
         if [[ "$RUNNER_OS" != "Windows" ]]; then
-          $OPENSEARCH_HOME/bin/opensearch &
+          $OPENSEARCH_HOME/bin/opensearch ${OPENSEARCH_ARGS} &
         else
-          $OPENSEARCH_HOME/bin/opensearch.bat -d &
+          $OPENSEARCH_HOME/bin/opensearch.bat ${OPENSEARCH_ARGS} -d &
         fi
 
         for attempt in {1..20}; do
@@ -91,3 +94,4 @@ runs:
       env:
         SECURED: ${{ inputs.secured }}
         RUNNER_OS: ${{ runner.os }}
+        OPENSEARCH_ARGS: ${{ inputs.opensearch_args }}
diff --git a/.github/workflows/integration-yaml-tests.yml b/.github/workflows/integration-yaml-tests.yml
index 50654a0b80..034d2bdc7f 100644
--- a/.github/workflows/integration-yaml-tests.yml
+++ b/.github/workflows/integration-yaml-tests.yml
@@ -52,6 +52,7 @@ jobs:
         with:
           version: ${{ matrix.version }}
           secured: true
+          opensearch_args: ${{ matrix.version == '2.8.0' && '-Eopensearch.experimental.feature.search_pipeline.enabled=true' || '' }}
 
       - name: Run YAML tests
         working-directory: client