Merge branch '9.1' into mergify/bp/9.1/pr-9634

pkoutsovasilis · web-flow · commit 83f91b4a7425 · 2025-09-10T17:34:49.000+03:00
diff --git a/.buildkite/bk.integration-fips.pipeline.yml b/.buildkite/bk.integration-fips.pipeline.yml
@@ -7,6 +7,7 @@ env:
   IMAGE_UBUNTU_2404_X86_64: "platform-ingest-elastic-agent-ubuntu-2404-1757120457"
   IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-1757120457"
   IMAGE_UBUNTU_ARM64_FIPS: "platform-ingest-elastic-agent-ubuntu-2204-fips-aarch64-1757120457"
+  ASDF_TERRAFORM_VERSION: 1.9.2
 
 # This section is used to define the plugins that will be used in the pipeline.
 # See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
@@ -21,7 +22,6 @@ steps:
   - label: Start ESS stack for FIPS integration tests
     key: integration-fips-ess
     env:
-      ASDF_TERRAFORM_VERSION: 1.9.2
       FIPS: "true"
       EC_ENDPOINT: "https://api.staging.elastic-gov.com"
       ESS_REGION: "us-gov-east-1"
@@ -127,6 +127,13 @@ steps:
   - label: ESS FIPS stack cleanup
     depends_on:
       - integration-tests-ubuntu-fips
+    env:
+      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"
     allow_dependency_failure: true
     command: |
       buildkite-agent artifact download "test_infra/ess/**" . --step "integration-fips-ess"
diff --git a/.buildkite/bk.integration.pipeline.yml b/.buildkite/bk.integration.pipeline.yml
@@ -12,6 +12,7 @@ env:
   IMAGE_DEBIAN_12: "platform-ingest-elastic-agent-debian-12-1757120457"
   IMAGE_WIN_2022: "platform-ingest-elastic-agent-windows-2022-1757120457"
   IMAGE_WIN_2025: "platform-ingest-elastic-agent-windows-2025-1757120457"
+  ASDF_TERRAFORM_VERSION: 1.9.2
 
 # This section is used to define the plugins that will be used in the pipeline.
 # See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
@@ -49,8 +50,6 @@ steps:
     notify:
       - github_commit_status:
           context: "buildkite/elastic-agent-extended-testing - ESS stack provision"
-    env:
-      ASDF_TERRAFORM_VERSION: 1.9.2
     command: .buildkite/scripts/steps/ess_start.sh
     retry:
       automatic:
diff --git a/.buildkite/scripts/steps/ess.ps1 b/.buildkite/scripts/steps/ess.ps1
@@ -40,6 +40,9 @@ function ess_up {
 }
 
 function ess_down {
+  param (
+      [string]$EssRegion = "gcp-us-west2"
+  )
   $Workspace = & git rev-parse --show-toplevel
   $TfDir = Join-Path -Path $Workspace -ChildPath "test_infra/ess/"
   $stateFilePath = Join-Path -Path $TfDir -ChildPath "terraform.tfstate"
@@ -52,7 +55,8 @@ function ess_down {
   try {
     Push-Location -Path $TfDir
     & terraform init
-    & terraform destroy -auto-approve
+    & terraform destroy -auto-approve `
+      -var="ess_region=$EssRegion"
     Pop-Location
   } catch {
     Write-Output "Error: Failed to destroy ESS stack(it will be auto-deleted later): $_"
diff --git a/.buildkite/scripts/steps/ess.sh b/.buildkite/scripts/steps/ess.sh
@@ -40,13 +40,15 @@ function ess_up() {
 }
 
 function ess_down() {
-  echo "~~~ Tearing down the ESS Stack"  
+  echo "~~~ Tearing down the ESS Stack"
+  local ESS_REGION=${1:-"gcp-us-west2"}
   local WORKSPACE=$(git rev-parse --show-toplevel)
   local TF_DIR="${WORKSPACE}/test_infra/ess/"
   
   pushd "${TF_DIR}"
   terraform init
-  terraform destroy -auto-approve
+  terraform destroy -auto-approve \
+    -var="ess_region=${ESS_REGION}"
   popd
 }
 
diff --git a/.buildkite/scripts/steps/ess_down.sh b/.buildkite/scripts/steps/ess_down.sh
@@ -3,4 +3,6 @@ set -euo pipefail
 
 source .buildkite/scripts/steps/ess.sh
 
-ess_down || echo "Failed to stop ESS stack" >&2
+ESS_REGION="${ESS_REGION:-gcp-us-west2}"
+
+ess_down "$ESS_REGION"
