Skip to content

Commit 2f045a1

Browse files
tsullivantsullivan
authored
Merge branch 'main' into renovate/main-emotion-dependencies
2 parents 8f1c6e2 + 9a409ab commit 2f045a1

2,076 files changed

Lines changed: 56633 additions & 235923 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.buildkite/ftr_security_serverless_configs.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ enabled:
136136
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/basic_license_essentials_tier/configs/serverless.config.ts
137137
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/serverless.config.ts
138138
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/serverless.config.ts
139-
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/serverless.config.ts
139+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/serverless.config.ts:
140+
queue: n2-4-spot
140141
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/authentication/trial_license_complete_tier/configs/serverless.config.ts
141142
- 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
142143
- 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‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,8 @@ enabled:
115115
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/ess.config.ts
116116
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/basic_license_essentials_tier/configs/ess.config.ts
117117
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/ess.config.ts
118-
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/ess.config.ts
118+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/ess.config.ts:
119+
queue: n2-4-spot
119120
- 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
120121
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/authentication/trial_license_complete_tier/configs/ess.config.ts
121122
- 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‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,11 @@ function getAgentImageConfig({ returnYaml = false } = {}): string | BuildkiteAge
8181

8282
const expandAgentQueue = (queueName: string = 'n2-4-spot', diskSizeGb?: number) => {
8383
const [kind, cores, addition] = queueName.split('-');
84+
const zonesToUse = 'southamerica-east1-c,asia-south2-a,us-central1-f';
8485
const additionalProps =
8586
{
86-
spot: { preemptible: true },
87-
virt: { enableNestedVirtualization: true },
87+
spot: { preemptible: true, zones: zonesToUse },
88+
virt: { enableNestedVirtualization: true, spotZones: zonesToUse },
8889
}[addition] || {};
8990

9091
return {

‎.buildkite/pipelines/build_api_docs.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ steps:
1010
provider: gcp
1111
machineType: n2-standard-4
1212
preemptible: true
13+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
1314
timeout_in_minutes: 70
1415

1516
- command: .buildkite/scripts/steps/api_docs/build_api_docs.sh
@@ -20,6 +21,7 @@ steps:
2021
provider: gcp
2122
machineType: n2-highmem-4
2223
preemptible: true
24+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
2325
key: build_api_docs
2426
timeout_in_minutes: 50
2527
retry:
@@ -37,6 +39,7 @@ steps:
3739
provider: gcp
3840
machineType: n2-standard-4
3941
preemptible: true
42+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
4043
key: publish_api_docs
4144
timeout_in_minutes: 50
4245
retry:

‎.buildkite/pipelines/on_merge.yml‎

Lines changed: 41 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ steps:
3838
provider: gcp
3939
machineType: n2-standard-8
4040
preemptible: true
41+
spotZones: us-central1-c,us-central1-b,us-central1-a
4142
key: build
4243
timeout_in_minutes: 60
4344
retry:
@@ -54,6 +55,7 @@ steps:
5455
machineType: n2-highcpu-8
5556
preemptible: true
5657
diskSizeGb: 105
58+
spotZones: us-central1-c,us-central1-b,us-central1-a
5759
timeout_in_minutes: 60
5860
retry:
5961
automatic:
@@ -68,6 +70,7 @@ steps:
6870
provider: gcp
6971
machineType: n2-standard-2
7072
preemptible: true
73+
spotZones: us-central1-c,us-central1-b,us-central1-a
7174
diskSizeGb: 105
7275
timeout_in_minutes: 60
7376
retry:
@@ -83,6 +86,7 @@ steps:
8386
provider: gcp
8487
machineType: n2-standard-16
8588
preemptible: true
89+
spotZones: us-central1-c,us-central1-b,us-central1-a
8690
diskSizeGb: 105
8791
timeout_in_minutes: 60
8892
retry:
@@ -98,6 +102,7 @@ steps:
98102
provider: gcp
99103
machineType: n2-standard-32
100104
preemptible: true
105+
spotZones: us-central1-c,us-central1-b,us-central1-a
101106
diskSizeGb: 105
102107
timeout_in_minutes: 60
103108
retry:
@@ -112,9 +117,9 @@ steps:
112117
imageProject: elastic-images-prod
113118
provider: gcp
114119
machineType: c4-standard-4
115-
diskType: 'hyperdisk-balanced'
120+
diskType: hyperdisk-balanced
116121
preemptible: true
117-
spotZones: us-central1-a,us-central1-b,us-central1-c
122+
spotZones: us-central1-c,us-central1-b,us-central1-a
118123
diskSizeGb: 105
119124
timeout_in_minutes: 60
120125
retry:
@@ -130,6 +135,7 @@ steps:
130135
provider: gcp
131136
machineType: n2-standard-4
132137
preemptible: true
138+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
133139
timeout_in_minutes: 60
134140
retry:
135141
automatic:
@@ -147,6 +153,7 @@ steps:
147153
provider: gcp
148154
machineType: n2-highmem-4
149155
preemptible: true
156+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
150157
diskSizeGb: 105
151158
timeout_in_minutes: 80
152159
retry:
@@ -234,6 +241,7 @@ steps:
234241
provider: gcp
235242
machineType: n2-standard-4
236243
preemptible: true
244+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
237245
timeout_in_minutes: 60
238246
parallelism: 3
239247
retry:
@@ -249,6 +257,7 @@ steps:
249257
provider: gcp
250258
machineType: n2-standard-4
251259
preemptible: true
260+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
252261
timeout_in_minutes: 60
253262
parallelism: 2
254263
retry:
@@ -264,6 +273,7 @@ steps:
264273
provider: gcp
265274
machineType: n2-standard-4
266275
preemptible: true
276+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
267277
timeout_in_minutes: 60
268278
parallelism: 10
269279
retry:
@@ -279,6 +289,7 @@ steps:
279289
provider: gcp
280290
machineType: n2-standard-4
281291
preemptible: true
292+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
282293
timeout_in_minutes: 60
283294
parallelism: 5
284295
retry:
@@ -294,6 +305,7 @@ steps:
294305
provider: gcp
295306
machineType: n2-standard-4
296307
preemptible: true
308+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
297309
timeout_in_minutes: 60
298310
parallelism: 1
299311
retry:
@@ -309,6 +321,7 @@ steps:
309321
provider: gcp
310322
machineType: n2-standard-4
311323
preemptible: true
324+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
312325
timeout_in_minutes: 60
313326
parallelism: 1
314327
retry:
@@ -324,6 +337,7 @@ steps:
324337
provider: gcp
325338
machineType: n2-standard-4
326339
preemptible: true
340+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
327341
timeout_in_minutes: 60
328342
parallelism: 1
329343
retry:
@@ -339,6 +353,7 @@ steps:
339353
provider: gcp
340354
machineType: n2-standard-4
341355
preemptible: true
356+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
342357
timeout_in_minutes: 60
343358
parallelism: 1
344359
retry:
@@ -354,6 +369,7 @@ steps:
354369
provider: gcp
355370
machineType: n2-standard-4
356371
preemptible: true
372+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
357373
timeout_in_minutes: 60
358374
parallelism: 4
359375
retry:
@@ -369,6 +385,7 @@ steps:
369385
provider: gcp
370386
machineType: n2-standard-4
371387
preemptible: true
388+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
372389
timeout_in_minutes: 60
373390
parallelism: 2
374391
retry:
@@ -384,6 +401,7 @@ steps:
384401
provider: gcp
385402
machineType: n2-standard-4
386403
preemptible: true
404+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
387405
timeout_in_minutes: 60
388406
parallelism: 2
389407
retry:
@@ -399,6 +417,7 @@ steps:
399417
provider: gcp
400418
machineType: n2-standard-4
401419
preemptible: true
420+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
402421
timeout_in_minutes: 60
403422
parallelism: 2
404423
retry:
@@ -414,6 +433,7 @@ steps:
414433
provider: gcp
415434
machineType: n2-standard-4
416435
preemptible: true
436+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
417437
timeout_in_minutes: 60
418438
parallelism: 2
419439
retry:
@@ -429,6 +449,7 @@ steps:
429449
provider: gcp
430450
machineType: n2-standard-4
431451
preemptible: true
452+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
432453
timeout_in_minutes: 60
433454
parallelism: 5
434455
retry:
@@ -444,6 +465,7 @@ steps:
444465
provider: gcp
445466
machineType: n2-standard-4
446467
preemptible: true
468+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
447469
timeout_in_minutes: 60
448470
parallelism: 4
449471
retry:
@@ -459,6 +481,7 @@ steps:
459481
provider: gcp
460482
machineType: n2-standard-4
461483
preemptible: true
484+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
462485
timeout_in_minutes: 60
463486
parallelism: 5
464487
retry:
@@ -474,6 +497,7 @@ steps:
474497
provider: gcp
475498
machineType: n2-standard-4
476499
preemptible: true
500+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
477501
timeout_in_minutes: 60
478502
parallelism: 3
479503
retry:
@@ -489,6 +513,7 @@ steps:
489513
provider: gcp
490514
machineType: n2-standard-4
491515
preemptible: true
516+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
492517
timeout_in_minutes: 60
493518
parallelism: 1
494519
retry:
@@ -504,6 +529,7 @@ steps:
504529
provider: gcp
505530
machineType: n2-standard-4
506531
preemptible: true
532+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
507533
timeout_in_minutes: 60
508534
parallelism: 1
509535
retry:
@@ -519,6 +545,7 @@ steps:
519545
provider: gcp
520546
machineType: n2-standard-4
521547
preemptible: true
548+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
522549
timeout_in_minutes: 60
523550
parallelism: 2
524551
retry:
@@ -534,6 +561,7 @@ steps:
534561
provider: gcp
535562
machineType: n2-standard-4
536563
preemptible: true
564+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
537565
timeout_in_minutes: 60
538566
parallelism: 3
539567
retry:
@@ -549,6 +577,7 @@ steps:
549577
provider: gcp
550578
machineType: n2-standard-4
551579
preemptible: true
580+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
552581
timeout_in_minutes: 60
553582
parallelism: 8
554583
retry:
@@ -564,6 +593,7 @@ steps:
564593
provider: gcp
565594
machineType: n2-standard-4
566595
preemptible: true
596+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
567597
timeout_in_minutes: 60
568598
parallelism: 8
569599
retry:
@@ -579,6 +609,7 @@ steps:
579609
provider: gcp
580610
machineType: n2-standard-4
581611
preemptible: true
612+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
582613
timeout_in_minutes: 60
583614
parallelism: 8
584615
retry:
@@ -595,6 +626,8 @@ steps:
595626
enableNestedVirtualization: true
596627
machineType: n2-standard-4
597628
diskSizeGb: 105
629+
preemptible: true
630+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
598631
timeout_in_minutes: 75
599632
parallelism: 20
600633
retry:
@@ -611,6 +644,8 @@ steps:
611644
enableNestedVirtualization: true
612645
machineType: n2-standard-4
613646
diskSizeGb: 105
647+
preemptible: true
648+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
614649
timeout_in_minutes: 75
615650
parallelism: 14
616651
retry:
@@ -626,6 +661,7 @@ steps:
626661
provider: gcp
627662
machineType: n2-standard-4
628663
preemptible: true
664+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
629665
timeout_in_minutes: 120
630666
parallelism: 3
631667
retry:
@@ -650,6 +686,7 @@ steps:
650686
provider: gcp
651687
machineType: n2-standard-8
652688
preemptible: true
689+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
653690
key: storybooks
654691
timeout_in_minutes: 80
655692
retry:
@@ -665,6 +702,7 @@ steps:
665702
provider: gcp
666703
machineType: n2-standard-2
667704
preemptible: true
705+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
668706
timeout_in_minutes: 60
669707
soft_fail: true
670708
retry:
@@ -680,6 +718,7 @@ steps:
680718
provider: gcp
681719
machineType: n2-standard-4
682720
preemptible: true
721+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
683722
artifact_paths: 'target/plugin_so_types_snapshot.json'
684723
timeout_in_minutes: 30
685724
retry:

‎.buildkite/pipelines/pull_request/agent_builder_smoke_tests.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ steps:
2222
agents:
2323
machineType: n2-standard-4
2424
preemptible: true
25+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
2526
retry:
2627
automatic:
2728
- exit_status: '-1'

‎.buildkite/pipelines/pull_request/ai_infra_gen_ai.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ steps:
2222
agents:
2323
machineType: n2-standard-4
2424
preemptible: true
25+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
2526
retry:
2627
automatic:
2728
- exit_status: '-1'

‎.buildkite/pipelines/pull_request/apm_cypress.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ steps:
44
agents:
55
machineType: n2-standard-4
66
preemptible: true
7+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
78
depends_on:
89
- build
910
- quick_checks

0 commit comments

Comments
 (0)