From b84c41afbc75a850652d642891aa7846df2753e5 Mon Sep 17 00:00:00 2001
From: Ed Savage <ed.savage@elastic.co>
Date: Thu, 1 Oct 2026 15:13:24 +1300
Subject: [PATCH] [ML] Support pinning Elasticsearch to a commit SHA in
 QA/PyTorch runs

Add an optional ES_COMMIT passthrough to the appex-qa trigger generated by
both run_qa_tests.yml.sh (QA-only and combined QA+PyTorch runs) and
run_pytorch_tests.yml.sh (the debug pipeline's PyTorch run). When ES_COMMIT
is set in the build environment it is forwarded to the downstream
appex-qa-stateful-custom-ml-cpp-build-testing build, where qaf-tests
(ElasticsearchRepoTask) checks out that exact commit after cloning ES_BRANCH.

This mirrors the existing ES_BRANCH / STACK_VERSION handling and lets us test
an ml-cpp build against a contemporaneous Elasticsearch source revision rather
than the moving tip of a branch. That is essential when the current ES main
has advanced past an ml-cpp artifact (e.g. the verifyControllerProtocolVersion
compatibility gate), which otherwise fails the local ES distribution build
before any QA workload runs.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .buildkite/pipelines/run_pytorch_tests.yml.sh | 10 ++++++++++
 .buildkite/pipelines/run_qa_tests.yml.sh      | 10 ++++++++++
 2 files changed, 20 insertions(+)

diff --git a/.buildkite/pipelines/run_pytorch_tests.yml.sh b/.buildkite/pipelines/run_pytorch_tests.yml.sh
index 997538de6..5dd61483f 100755
--- a/.buildkite/pipelines/run_pytorch_tests.yml.sh
+++ b/.buildkite/pipelines/run_pytorch_tests.yml.sh
@@ -42,6 +42,16 @@ cat <<EOL
 EOL
 fi
 
+# Optionally pin the Elasticsearch checkout to an exact commit SHA. qaf-tests
+# honours ES_COMMIT (ElasticsearchRepoTask) and checks out that commit after
+# cloning the branch, letting us test ml-cpp against a contemporaneous ES build
+# instead of the moving tip of ES_BRANCH.
+if [ "${ES_COMMIT:-}" != "" ]; then
+cat <<EOL
+        ES_COMMIT: "${ES_COMMIT}"
+EOL
+fi
+
 if [ "${STACK_VERSION}" != "" ]; then
 cat <<EOL
         STACK_VERSION: "${STACK_VERSION}"
diff --git a/.buildkite/pipelines/run_qa_tests.yml.sh b/.buildkite/pipelines/run_qa_tests.yml.sh
index ead10bced..69304f848 100755
--- a/.buildkite/pipelines/run_qa_tests.yml.sh
+++ b/.buildkite/pipelines/run_qa_tests.yml.sh
@@ -61,6 +61,16 @@ cat <<EOL
 EOL
 fi
 
+# Optionally pin the Elasticsearch checkout to an exact commit SHA. qaf-tests
+# honours ES_COMMIT (ElasticsearchRepoTask) and checks out that commit after
+# cloning the branch, letting us test ml-cpp against a contemporaneous ES build
+# instead of the moving tip of ES_BRANCH.
+if [ "${ES_COMMIT:-}" != "" ]; then
+cat <<EOL
+        ES_COMMIT: "${ES_COMMIT}"
+EOL
+fi
+
 if [ "${STACK_VERSION}" != "" ]; then
 cat <<EOL
         STACK_VERSION: "${STACK_VERSION}"