From f8a2a091a1bb5fff81330015ccfacc089706cf23 Mon Sep 17 00:00:00 2001
From: Siarhei Harbuz <siarhei.harbuz@elastic.co>
Date: Thu, 29 Feb 2024 12:27:50 +0200
Subject: [PATCH] add cloud scrit and replace commands in the Cloud and Go-int
 steps

---
 .buildkite/scripts/common.sh        | 4 ++++
 .buildkite/scripts/install_tools.sh | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.buildkite/scripts/common.sh b/.buildkite/scripts/common.sh
index e4eebdf2820f..8209b912eb1a 100755
--- a/.buildkite/scripts/common.sh
+++ b/.buildkite/scripts/common.sh
@@ -462,4 +462,8 @@ if are_paths_changed "${packaging_changeset[@]}" ; then
   export PACKAGING_CHANGES="true"
 fi
 
+if [[ "$BUILDKITE_PIPELINE_SLUG" == "beats-xpack-metricbeat" ]]; then
+  withModule "${MODULE_DIR}"
+fi
+
 check_and_set_beat_vars
diff --git a/.buildkite/scripts/install_tools.sh b/.buildkite/scripts/install_tools.sh
index 2b067415b368..061c471e8727 100755
--- a/.buildkite/scripts/install_tools.sh
+++ b/.buildkite/scripts/install_tools.sh
@@ -38,7 +38,6 @@ fi
 
 if [[ "$BUILDKITE_PIPELINE_SLUG" == "beats-xpack-metricbeat" ]]; then
   startCloudTestEnv "${MODULE_DIR}"
-  withModule "${MODULE_DIR}"
 fi
 
 with_go "${GO_VERSION}"