chore(NA): use different gcp zones for spot instances

.buildkite/ftr_security_serverless_configs.yml

@@ -136,7 +136,8 @@ enabled:
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/basic_license_essentials_tier/configs/serverless.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/serverless.config.ts
-  - x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/serverless.config.ts
+  - x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/serverless.config.ts:
+      queue: n2-4-spot
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/authentication/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/endpoint_exceptions_moved_ff.serverless.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/metadata/trial_license_complete_tier/configs/serverless.config.ts

.buildkite/ftr_security_stateful_configs.yml

@@ -115,7 +115,8 @@ enabled:
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/ess.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/basic_license_essentials_tier/configs/ess.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/ess.config.ts
-  - x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/ess.config.ts
+  - x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/ess.config.ts:
+      queue: n2-4-spot
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/endpoint_exceptions_moved_ff.ess.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/authentication/trial_license_complete_tier/configs/ess.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/metadata/trial_license_complete_tier/configs/ess.config.ts

.buildkite/pipeline-utils/agent_images.ts

@@ -81,10 +81,11 @@ function getAgentImageConfig({ returnYaml = false } = {}): string | BuildkiteAge
 
 const expandAgentQueue = (queueName: string = 'n2-4-spot', diskSizeGb?: number) => {
   const [kind, cores, addition] = queueName.split('-');
+  const zonesToUse = 'southamerica-east1-c,asia-south2-a,us-central1-f';
   const additionalProps =
     {
-      spot: { preemptible: true },
-      virt: { enableNestedVirtualization: true },
+      spot: { preemptible: true, zones: zonesToUse },
+      virt: { enableNestedVirtualization: true, spotZones: zonesToUse },
     }[addition] || {};
 
   return {

.buildkite/pipelines/build_api_docs.yml

@@ -10,6 +10,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 70
 
   - command: .buildkite/scripts/steps/api_docs/build_api_docs.sh
@@ -20,6 +21,7 @@ steps:
       provider: gcp
       machineType: n2-highmem-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     key: build_api_docs
     timeout_in_minutes: 50
     retry:
@@ -37,6 +39,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     key: publish_api_docs
     timeout_in_minutes: 50
     retry:

.buildkite/pipelines/on_merge.yml

@@ -38,6 +38,7 @@ steps:
       provider: gcp
       machineType: n2-standard-8
       preemptible: true
+      spotZones: us-central1-c,us-central1-b,us-central1-a
     key: build
     timeout_in_minutes: 60
     retry:
@@ -54,6 +55,7 @@ steps:
       machineType: n2-highcpu-8
       preemptible: true
       diskSizeGb: 105
+      spotZones: us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -68,6 +70,7 @@ steps:
       provider: gcp
       machineType: n2-standard-2
       preemptible: true
+      spotZones: us-central1-c,us-central1-b,us-central1-a
       diskSizeGb: 105
     timeout_in_minutes: 60
     retry:
@@ -83,6 +86,7 @@ steps:
       provider: gcp
       machineType: n2-standard-16
       preemptible: true
+      spotZones: us-central1-c,us-central1-b,us-central1-a
       diskSizeGb: 105
     timeout_in_minutes: 60
     retry:
@@ -98,6 +102,7 @@ steps:
       provider: gcp
       machineType: n2-standard-32
       preemptible: true
+      spotZones: us-central1-c,us-central1-b,us-central1-a
       diskSizeGb: 105
     timeout_in_minutes: 60
     retry:
@@ -112,9 +117,9 @@ steps:
       imageProject: elastic-images-prod
       provider: gcp
       machineType: c4-standard-4
-      diskType: 'hyperdisk-balanced'
+      diskType: hyperdisk-balanced
       preemptible: true
-      spotZones: us-central1-a,us-central1-b,us-central1-c
+      spotZones: us-central1-c,us-central1-b,us-central1-a
       diskSizeGb: 105
     timeout_in_minutes: 60
     retry:
@@ -130,6 +135,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     retry:
       automatic:
@@ -147,6 +153,7 @@ steps:
       provider: gcp
       machineType: n2-highmem-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
       diskSizeGb: 105
     timeout_in_minutes: 80
     retry:
@@ -234,6 +241,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 3
     retry:
@@ -249,6 +257,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 2
     retry:
@@ -264,6 +273,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 10
     retry:
@@ -279,6 +289,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 5
     retry:
@@ -294,6 +305,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 1
     retry:
@@ -309,6 +321,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 1
     retry:
@@ -324,6 +337,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 1
     retry:
@@ -339,6 +353,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 1
     retry:
@@ -354,6 +369,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 4
     retry:
@@ -369,6 +385,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 2
     retry:
@@ -384,6 +401,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 2
     retry:
@@ -399,6 +417,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 2
     retry:
@@ -414,6 +433,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 2
     retry:
@@ -429,6 +449,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 5
     retry:
@@ -444,6 +465,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 4
     retry:
@@ -459,6 +481,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 5
     retry:
@@ -474,6 +497,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 3
     retry:
@@ -489,6 +513,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 1
     retry:
@@ -504,6 +529,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 1
     retry:
@@ -519,6 +545,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 2
     retry:
@@ -534,6 +561,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 3
     retry:
@@ -549,6 +577,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 8
     retry:
@@ -564,6 +593,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 8
     retry:
@@ -579,6 +609,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     parallelism: 8
     retry:
@@ -595,6 +626,8 @@ steps:
       enableNestedVirtualization: true
       machineType: n2-standard-4
       diskSizeGb: 105
+      preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 75
     parallelism: 20
     retry:
@@ -611,6 +644,8 @@ steps:
       enableNestedVirtualization: true
       machineType: n2-standard-4
       diskSizeGb: 105
+      preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 75
     parallelism: 14
     retry:
@@ -626,6 +661,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 120
     parallelism: 3
     retry:
@@ -650,6 +686,7 @@ steps:
       provider: gcp
       machineType: n2-standard-8
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     key: storybooks
     timeout_in_minutes: 80
     retry:
@@ -665,6 +702,7 @@ steps:
       provider: gcp
       machineType: n2-standard-2
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     timeout_in_minutes: 60
     soft_fail: true
     retry:
@@ -680,6 +718,7 @@ steps:
       provider: gcp
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     artifact_paths: 'target/plugin_so_types_snapshot.json'
     timeout_in_minutes: 30
     retry:

.buildkite/pipelines/pull_request/agent_builder_smoke_tests.yml

@@ -22,6 +22,7 @@ steps:
         agents:
           machineType: n2-standard-4
           preemptible: true
+          spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
         retry:
           automatic:
             - exit_status: '-1'

.buildkite/pipelines/pull_request/ai_infra_gen_ai.yml

@@ -22,6 +22,7 @@ steps:
         agents:
           machineType: n2-standard-4
           preemptible: true
+          spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
         retry:
           automatic:
             - exit_status: '-1'

.buildkite/pipelines/pull_request/apm_cypress.yml

@@ -4,6 +4,7 @@ steps:
     agents:
       machineType: n2-standard-4
       preemptible: true
+      spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
     depends_on:
       - build
       - quick_checks