From 431b0949d710be907deb620e24838b8118c3c7e4 Mon Sep 17 00:00:00 2001
From: Pavel Zorin <pavel.zorin@elastic.co>
Date: Tue, 15 Oct 2024 09:49:00 +0200
Subject: [PATCH] BK Integration tests: fix retry usage (#5760)

* Integration tests: fix retry usage

* Integration tests: fix retry usage

* Correct terraform version

* Correct terraform version

* Correct terraform version

* Correct terraform version

* Correct terraform version

* Pin agent version

* Pin agent version
---
 .buildkite/bk.integration.pipeline.yml       | 2 +-
 .buildkite/scripts/steps/ess.sh              | 4 ++--
 .buildkite/scripts/sudo-integration-tests.sh | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.buildkite/bk.integration.pipeline.yml b/.buildkite/bk.integration.pipeline.yml
index a825a159a7c..37e7120035f 100644
--- a/.buildkite/bk.integration.pipeline.yml
+++ b/.buildkite/bk.integration.pipeline.yml
@@ -5,7 +5,7 @@ env:
   VAULT_PATH: "kv/ci-shared/observability-ingest/cloud/gcp"
   ASDF_MAGE_VERSION: 1.14.0
   ASDF_GOLANG_VERSION: 1.22.6
-  ASDF_TERRAFORM_VERSION: 1.9.3
+  ASDF_TERRAFORM_VERSION: 1.9.2
 
 steps:
   - label: "Integration tests: packaging"
diff --git a/.buildkite/scripts/steps/ess.sh b/.buildkite/scripts/steps/ess.sh
index 29d1d80115e..1da2ba5c165 100644
--- a/.buildkite/scripts/steps/ess.sh
+++ b/.buildkite/scripts/steps/ess.sh
@@ -13,7 +13,7 @@ function ess_up() {
     return 1
   fi
 
-  export EC_API_KEY=$(retry 5 vault kv get -field=apiKey kv/ci-shared/platform-ingest/platform-ingest-ec-prod)
+  export EC_API_KEY=$(retry -t 5 -- vault kv get -field=apiKey kv/ci-shared/platform-ingest/platform-ingest-ec-prod)
   
   if [[ -z "${EC_API_KEY}" ]]; then
     echo "Error: Failed to get EC API key from vault" >&2
@@ -48,7 +48,7 @@ function ess_down() {
   local WORKSPACE=$(git rev-parse --show-toplevel)
   local TF_DIR="${WORKSPACE}/test_infra/ess/"
   if [ -z "${EC_API_KEY:-}" ]; then
-    export EC_API_KEY=$(retry 5 vault kv get -field=apiKey kv/ci-shared/platform-ingest/platform-ingest-ec-prod)    
+    export EC_API_KEY=$(retry -t 5 -- vault kv get -field=apiKey kv/ci-shared/platform-ingest/platform-ingest-ec-prod)    
   fi
   
   pushd "${TF_DIR}"
diff --git a/.buildkite/scripts/sudo-integration-tests.sh b/.buildkite/scripts/sudo-integration-tests.sh
index c2ac96566b6..821ff05d9c7 100755
--- a/.buildkite/scripts/sudo-integration-tests.sh
+++ b/.buildkite/scripts/sudo-integration-tests.sh
@@ -9,10 +9,13 @@ TESTS_TO_RUN=$2
 
 echo "~~~ Running integration tests as $USER"
 echo "~~~ Integration tests: ${GROUP_NAME}"
-# TODO: Pass the actual version of the agen
 gotestsum --version
+PACKAGE_VERSION="$(cat .package-version)"
+if [[ -n "$PACKAGE_VERSION" ]]; then
+    PACKAGE_VERSION=${PACKAGE_VERSION}"-SNAPSHOT"
+fi
 set +e
-SNAPSHOT=true TEST_DEFINE_PREFIX="sudo_${GROUP_NAME}_ubuntu" gotestsum --no-color -f standard-quiet --junitfile "build/${GROUP_NAME}.integration.xml" --jsonfile "build/${GROUP_NAME}.integration.out.json" -- -tags integration -test.shuffle on -test.timeout 2h0m0s -test.run "${TESTS_TO_RUN}" github.com/elastic/elastic-agent/testing/integration
+AGENT_VERSION="${PACKAGE_VERSION}" SNAPSHOT=true TEST_DEFINE_PREFIX="sudo_${GROUP_NAME}_ubuntu" gotestsum --no-color -f standard-quiet --junitfile "build/${GROUP_NAME}.integration.xml" --jsonfile "build/${GROUP_NAME}.integration.out.json" -- -tags integration -test.shuffle on -test.timeout 2h0m0s -test.run "${TESTS_TO_RUN}" github.com/elastic/elastic-agent/testing/integration
 TESTS_EXIT_STATUS=$?
 set -e