Improve ci machine types

.buildkite/ftr_oblt_serverless_configs.yml

@@ -9,7 +9,7 @@ disabled:
   # Empty configs
   - x-pack/solutions/observability/test/serverless/api_integration/configs/config.feature_flags.ts
 
-defaultQueue: 'n2-4-spot'
+defaultQueue: 'n2d-4-spot'
 enabled:
   - x-pack/solutions/observability/test/serverless/api_integration/configs/config.ts
   - x-pack/solutions/observability/test/serverless/api_integration/configs/config.logs_essentials.ts

.buildkite/ftr_oblt_stateful_configs.yml

@@ -25,7 +25,7 @@ disabled:
   # Observability AI Assistant local-only tests
   - x-pack/solutions/observability/test/api_integration_deployment_agnostic/configs/stateful/oblt.ai_assistant_local.stateful.config.ts
 
-defaultQueue: 'n2-4-spot'
+defaultQueue: 'n2d-4-spot'
 enabled:
   - x-pack/solutions/observability/test/alerting_api_integration/observability/config.ts
   - x-pack/solutions/observability/test/api_integration/apis/logs_ui/config.ts

.buildkite/ftr_platform_stateful_configs.yml

@@ -51,7 +51,7 @@ disabled:
   - x-pack/platform/test/functional_gen_ai/inference/config.ts
   - x-pack/platform/test/agent_builder/smoke_tests/config.stateful.ts
 
-defaultQueue: 'n2-4-spot'
+defaultQueue: 'n2d-4-spot'
 enabled:
   - src/platform/test/accessibility/config.ts
   - src/platform/test/analytics/config.ts

.buildkite/ftr_search_serverless_configs.yml

@@ -2,7 +2,7 @@ disabled:
   # Base config files, only necessary to inform config finding script
   - x-pack/platform/test/serverless/functional/config.search.base.ts
 
-defaultQueue: 'n2-4-spot'
+defaultQueue: 'n2d-4-spot'
 enabled:
   - x-pack/solutions/search/test/serverless/api_integration/configs/config.ts
   - x-pack/solutions/search/test/serverless/api_integration/configs/config.feature_flags.ts

.buildkite/ftr_search_stateful_configs.yml

@@ -2,7 +2,7 @@ disabled:
   # Base config files, only necessary to inform config finding script
   - x-pack/solutions/search/test/api_integration/config.ts
 
-defaultQueue: 'n2-4-spot'
+defaultQueue: 'n2d-4-spot'
 enabled:
   - x-pack/solutions/search/test/functional_search/config.ts
   - x-pack/solutions/search/test/functional_search/config/config.basic.ts

.buildkite/ftr_security_serverless_configs.yml

@@ -28,7 +28,7 @@ disabled:
   - x-pack/solutions/security/test/serverless/api_integration/configs/config.feature_flags.ts
   - x-pack/solutions/security/test/serverless/functional/configs/config.feature_flags.ts
 
-defaultQueue: 'n2-4-spot'
+defaultQueue: 'n2d-4-spot'
 enabled:
   - x-pack/solutions/security/test/serverless/api_integration/configs/config.ts
   - x-pack/platform/test/serverless/api_integration/configs/security/config.group1.ts

.buildkite/ftr_security_stateful_configs.yml

@@ -36,7 +36,7 @@ disabled:
   # Detection Rules Management OOM Testing
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/oom_testing/configs/ess_basic_license.config.ts
 
-defaultQueue: 'n2-4-spot'
+defaultQueue: 'n2d-4-spot'
 enabled:
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/ess.config.ts
   - x-pack/solutions/security/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/configs/ess.config.ts

.buildkite/ftr_workplace_ai_serverless_configs.yml

@@ -6,7 +6,7 @@ disabled:
   - x-pack/solutions/workplaceai/test/serverless/functional/configs/config.feature_flags.ts
   - x-pack/solutions/workplaceai/test/serverless/api_integration/configs/config.feature_flags.ts
 
-defaultQueue: 'n2-4-spot'
+defaultQueue: 'n2d-4-spot'
 enabled:
   - x-pack/solutions/workplaceai/test/serverless/api_integration/configs/config.ts
   - x-pack/platform/test/serverless/api_integration/configs/workplaceai/config.group1.ts

.buildkite/pipeline-utils/agent_images.ts

@@ -79,7 +79,7 @@ function getAgentImageConfig({ returnYaml = false } = {}): string | BuildkiteAge
   return config;
 }
 
-const expandAgentQueue = (queueName: string = 'n2-4-spot', diskSizeGb?: number) => {
+const expandAgentQueue = (queueName: string = 'n2d-4-spot', diskSizeGb?: number) => {
   const [kind, cores, addition] = queueName.split('-');
   const zonesToUse = 'southamerica-east1-c,asia-south2-a,us-central1-f';
   const additionalProps =

.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts

@@ -340,7 +340,7 @@ export async function pickTestGroupRunOrder() {
             parallelism: unit.count,
             timeout_in_minutes: 120,
             key: 'jest',
-            agents: expandAgentQueue('n2-4-spot', 110),
+            agents: expandAgentQueue('n2d-4-spot', 110),
             env: {
               SCOUT_TARGET_TYPE: 'local',
             },
@@ -362,7 +362,7 @@ export async function pickTestGroupRunOrder() {
             parallelism: integration.count,
             timeout_in_minutes: 120,
             key: 'jest-integration',
-            agents: expandAgentQueue('n2-4-spot', 105),
+            agents: expandAgentQueue('n2d-4-spot', 105),
             env: {
               SCOUT_TARGET_TYPE: 'local',
             },

.buildkite/pipeline-utils/scout/pick_scout_test_group_run_order.ts

@@ -56,7 +56,7 @@ export async function pickScoutTestGroupRunOrder(scoutConfigsPath: string) {
     return {
       label: `Scout: [ ${module.group} / ${module.name} ] ${module.type}`,
       key: module.name,
-      agents: expandAgentQueue(usesParallelWorkers ? 'n2-8-spot' : 'n2-4-spot'),
+      agents: expandAgentQueue(usesParallelWorkers ? 'n2d-8-spot' : 'n2d-4-spot'),
       group: module.group,
     };
   });

.buildkite/pipelines/flaky_tests/pipeline.ts

@@ -212,7 +212,7 @@ for (const testSuite of testSuites) {
       concurrency,
       concurrency_group: process.env.UUID,
       concurrency_method: 'eager',
-      agents: expandAgentQueue('n2-4-spot'),
+      agents: expandAgentQueue('n2d-4-spot'),
       depends_on: 'build',
       timeout_in_minutes: 150,
       cancel_on_build_failing: true,
@@ -240,7 +240,7 @@ for (const testSuite of testSuites) {
       concurrency,
       concurrency_group: process.env.UUID,
       concurrency_method: 'eager',
-      agents: expandAgentQueue(usesParallelWorkers ? 'n2-8-spot' : 'n2-4-spot'),
+      agents: expandAgentQueue(usesParallelWorkers ? 'n2d-8-spot' : 'n2d-4-spot'),
       depends_on: 'build',
       timeout_in_minutes: 60,
       cancel_on_build_failing: true,
@@ -260,7 +260,7 @@ for (const testSuite of testSuites) {
           `Group configuration was not found in groups.json for the following cypress suite: {${suiteName}}.`
         );
       }
-      const agentQueue = suiteName.includes('defend_workflows') ? 'n2-4-virt' : 'n2-4-spot';
+      const agentQueue = suiteName.includes('defend_workflows') ? 'n2-4-virt' : 'n2d-4-spot';
       steps.push({
         command: `.buildkite/scripts/steps/functional/${suiteName}.sh`,
         label: group.name,
@@ -297,7 +297,7 @@ for (const testSuite of testSuites) {
       steps.push({
         command: `.buildkite/scripts/steps/functional/${suiteName}.sh`,
         label: synthGroup.name,
-        agents: expandAgentQueue('n2-4-spot'),
+        agents: expandAgentQueue('n2d-4-spot'),
         key: `${TestSuiteType.SYNTHETICS}-${suiteIndex++}`,
         depends_on: 'build',
         timeout_in_minutes: 30,
@@ -325,7 +325,7 @@ pipeline.steps.push({
 pipeline.steps.push({
   command: 'ts-node .buildkite/pipelines/flaky_tests/post_stats_on_pr.ts',
   label: 'Post results on Github pull request',
-  agents: expandAgentQueue('n2-4-spot'),
+  agents: expandAgentQueue('n2d-4-spot'),
   timeout_in_minutes: 15,
   retry: {
     automatic: [{ exit_status: '-1', limit: 3 }],