From e8df736e80dc55e4eb1ecf20c1650f982488e9da Mon Sep 17 00:00:00 2001
From: Mario Rodriguez Molins <mario.rodriguez@elastic.co>
Date: Wed, 3 Dec 2025 18:47:53 +0100
Subject: [PATCH 1/3] [CI] Remove unused vars

---
 .buildkite/hooks/pre-command                 |  2 --
 .buildkite/hooks/pre-exit                    |  1 -
 .buildkite/scripts/test-with-integrations.sh | 12 ++++++++++++
 .buildkite/scripts/tooling.sh                |  6 ------
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
index 84305ae5dc..b826e5ac1d 100644
--- a/.buildkite/hooks/pre-command
+++ b/.buildkite/hooks/pre-command
@@ -47,8 +47,6 @@ export CREATED_DATE
 # Secrets must be redacted
 # https://buildkite.com/docs/pipelines/managing-log-output#redacted-environment-variables
 
-export TMP_FOLDER_TEMPLATE_BASE="tmp.${REPO}"
-export TMP_FOLDER_TEMPLATE="${TMP_FOLDER_TEMPLATE_BASE}.XXXXXXXXX"
 export JOB_GCS_BUCKET_INTERNAL="ecosystem-ci-internal"
 
 if [[ "${BUILDKITE_PIPELINE_SLUG}" == "elastic-package-test-serverless" ]]; then
diff --git a/.buildkite/hooks/pre-exit b/.buildkite/hooks/pre-exit
index 940c9454ac..587f6ea03d 100755
--- a/.buildkite/hooks/pre-exit
+++ b/.buildkite/hooks/pre-exit
@@ -17,7 +17,6 @@ if [[ "${BUILDKITE_PIPELINE_SLUG}" == "elastic-package-test-serverless" && "${BU
 fi
 
 echo "--- Cleanup"
-cleanup
 unset_secrets
 
 exit "$exit_code"
diff --git a/.buildkite/scripts/test-with-integrations.sh b/.buildkite/scripts/test-with-integrations.sh
index ac36727692..555a896346 100755
--- a/.buildkite/scripts/test-with-integrations.sh
+++ b/.buildkite/scripts/test-with-integrations.sh
@@ -3,6 +3,18 @@ source .buildkite/scripts/install_deps.sh
 
 set -euo pipefail
 
+TMP_FOLDER_TEMPLATE_BASE="tmp.${GITHUB_PR_BASE_REPO}"
+TMP_FOLDER_TEMPLATE="${TMP_FOLDER_TEMPLATE_BASE}.XXXXXXXXX"
+
+cleanup() {
+    echo "Deleting temporal files..."
+    cd "${WORKSPACE}"
+    rm -rf ${TMP_FOLDER_TEMPLATE_BASE}.*
+    echo "Done."
+}
+
+trap cleanup EXIT
+
 add_bin_path
 
 echo "--- Install gh cli"
diff --git a/.buildkite/scripts/tooling.sh b/.buildkite/scripts/tooling.sh
index 2b13975b9e..1b236dbb26 100755
--- a/.buildkite/scripts/tooling.sh
+++ b/.buildkite/scripts/tooling.sh
@@ -116,12 +116,6 @@ clean_safe_logs() {
     rm -rf "${WORKSPACE}/build/container-logs"
 }
 
-cleanup() {
-  echo "Deleting temporary files..."
-  rm -rf ${WORKSPACE}/${TMP_FOLDER_TEMPLATE_BASE}.*
-  echo "Done."
-}
-
 create_collapsed_annotation() {
     local title="$1"
     local file="$2"

From 68865fe2e71baf1b1eaf9ecaab833f293f2f6331 Mon Sep 17 00:00:00 2001
From: Mario Rodriguez Molins <mario.rodriguez@elastic.co>
Date: Wed, 3 Dec 2025 18:54:53 +0100
Subject: [PATCH 2/3] Test failure post-checkout

---
 .buildkite/hooks/post-checkout | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.buildkite/hooks/post-checkout b/.buildkite/hooks/post-checkout
index e10f15de7b..2f0ecfc9ce 100644
--- a/.buildkite/hooks/post-checkout
+++ b/.buildkite/hooks/post-checkout
@@ -49,5 +49,7 @@ checkout_merge "${TARGET_BRANCH}" "${PR_COMMIT}" "${MERGE_BRANCH}"
 echo "Commit information"
 git --no-pager log --format=%B -n 1
 
+ls not-exist-file
+
 # Ensure buildkite groups are rendered
 echo ""

From 45af35af2790b3c586740ae2631d2cf2a4687d20 Mon Sep 17 00:00:00 2001
From: Mario Rodriguez Molins <mario.rodriguez@elastic.co>
Date: Wed, 3 Dec 2025 19:03:06 +0100
Subject: [PATCH 3/3] Revert "Test failure post-checkout"

This reverts commit 68865fe2e71baf1b1eaf9ecaab833f293f2f6331.
---
 .buildkite/hooks/post-checkout | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.buildkite/hooks/post-checkout b/.buildkite/hooks/post-checkout
index 2f0ecfc9ce..e10f15de7b 100644
--- a/.buildkite/hooks/post-checkout
+++ b/.buildkite/hooks/post-checkout
@@ -49,7 +49,5 @@ checkout_merge "${TARGET_BRANCH}" "${PR_COMMIT}" "${MERGE_BRANCH}"
 echo "Commit information"
 git --no-pager log --format=%B -n 1
 
-ls not-exist-file
-
 # Ensure buildkite groups are rendered
 echo ""