BK Integration tests: fix retry usage (#5760) (#6278)

* 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 (cherry picked from commit 431b094) Co-authored-by: Pavel Zorin <pavel.zorin@elastic.co>
elastic · Dec 12, 2024 · 7272ca6 · 7272ca6
1 parent 95c2c50
commit 7272ca6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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