Fix ess respawn on retry (#11375) (#11395)

* Fix ESS creation script on step retry

* fixup! Fix ESS creation script on step retry

(cherry picked from commit 60eb3ed)

Co-authored-by: Paolo Chilà <[email protected]>

Author: mergify[bot]

.buildkite/bk.integration-fips.pipeline.yml

@@ -62,7 +62,9 @@ steps:
           FIPS: "true"
           EC_ENDPOINT: "https://api.staging.elastic-gov.com"
           ESS_REGION: "us-gov-east-1"
+          TF_VAR_deployment_template_id: "aws-general-purpose"
           TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
+          TF_VAR_docker_images_name_suffix: "-fips"
           TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
         command: |
           buildkite-agent artifact download build/distributions/** . --step 'packaging-amd64-fips'
@@ -94,7 +96,9 @@ steps:
           FIPS: "true"
           EC_ENDPOINT: "https://api.staging.elastic-gov.com"
           ESS_REGION: "us-gov-east-1"
+          TF_VAR_deployment_template_id: "aws-general-purpose"
           TF_VAR_integration_server_docker_image: "docker.elastic.co/beats-ci/elastic-agent-cloud-fips:git-${BUILDKITE_COMMIT:0:12}"
+          TF_VAR_docker_images_name_suffix: "-fips"
           TEST_PACKAGE: "github.com/elastic/elastic-agent/testing/integration/ess"
         command: |
           buildkite-agent artifact download build/distributions/** . --step 'packaging-arm64-fips'

.buildkite/scripts/steps/integration_tests_tf.sh

@@ -20,6 +20,8 @@ if [ -z "$TEST_SUDO" ]; then
   exit 1
 fi
 
+ESS_REGION=${ESS_REGION:-""}
+
 # Override the stack version from `.package-version` contents
 # There is a time when the current snapshot is not available on cloud yet, so we cannot use the latest version automatically
 # This file is managed by an automation (mage integration:UpdateAgentPackageVersion) that check if the snapshot is ready.
@@ -36,8 +38,8 @@ fi
 # BUILDKITE_RETRY_COUNT > 0 for the retries
 if [[ "${BUILDKITE_RETRY_COUNT}" -gt 0 || "${FORCE_ESS_CREATE:-false}" == "true" ]]; then
   echo "~~~ The steps is retried, starting the ESS stack again"
-  trap 'ess_down' EXIT
-  ess_up "$STACK_VERSION" "$STACK_BUILD_ID" || (echo -e "^^^ +++\nFailed to start ESS stack")
+  trap 'ess_down "$ESS_REGION"' EXIT
+  ess_up "$STACK_VERSION" "$STACK_BUILD_ID" "$ESS_REGION"
 else
   # For the first run, we start the stack in the start_ess.sh step and it sets the meta-data
   echo "~~~ Receiving ESS stack metadata"