Skip to content

Commit f8fe148

Browse files
delannidelanni
committed
Merge branch '9.2' into backport/9.2/pr-244556
# Conflicts: # package.json # yarn.lock
2 parents 9141960 + 5dff5d9 commit f8fe148

75 files changed

Lines changed: 586 additions & 34 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_oblt_serverless_configs.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ disabled:
1919
- x-pack/solutions/observability/test/serverless/api_integration/test_suites/fleet/config.ts
2020
- x-pack/solutions/observability/test/serverless/functional/configs/config.ts
2121
- x-pack/solutions/observability/test/serverless/functional/configs/config.logs_essentials.ts
22+
- x-pack/solutions/observability/test/serverless/functional/configs/config.onboarding.ts
2223
- x-pack/platform/test/serverless/functional/configs/observability/config.examples.ts
2324
- x-pack/solutions/observability/test/serverless/functional/configs/config.feature_flags.ts
2425
- x-pack/platform/test/serverless/functional/configs/observability/config.saved_objects_management.ts

‎.buildkite/ftr_security_serverless_configs.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ disabled:
133133
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/basic_license_essentials_tier/configs/serverless.config.ts
134134
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/serverless.config.ts
135135
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/serverless.config.ts
136-
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/serverless.config.ts
136+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/serverless.config.ts:
137+
queue: n2-4-spot
137138
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/authentication/trial_license_complete_tier/configs/serverless.config.ts
138139
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/metadata/trial_license_complete_tier/configs/serverless.config.ts
139140
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/package/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
@@ -114,7 +114,8 @@ enabled:
114114
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/trial_license_complete_tier/configs/ess.config.ts
115115
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/investigation/timeline/basic_license_essentials_tier/configs/ess.config.ts
116116
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/ess.config.ts
117-
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/ess.config.ts
117+
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/artifacts/trial_license_complete_tier/configs/ess.config.ts:
118+
queue: n2-4-spot
118119
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/authentication/trial_license_complete_tier/configs/ess.config.ts
119120
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/metadata/trial_license_complete_tier/configs/ess.config.ts
120121
- x-pack/solutions/security/test/security_solution_api_integration/test_suites/edr_workflows/package/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: 31 additions & 3 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:
@@ -218,6 +225,7 @@ steps:
218225
provider: gcp
219226
machineType: n2-standard-4
220227
preemptible: true
228+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
221229
timeout_in_minutes: 60
222230
parallelism: 4
223231
retry:
@@ -233,6 +241,7 @@ steps:
233241
provider: gcp
234242
machineType: n2-standard-4
235243
preemptible: true
244+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
236245
timeout_in_minutes: 60
237246
parallelism: 2
238247
retry:
@@ -248,6 +257,7 @@ steps:
248257
provider: gcp
249258
machineType: n2-standard-4
250259
preemptible: true
260+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
251261
timeout_in_minutes: 60
252262
parallelism: 2
253263
retry:
@@ -263,6 +273,7 @@ steps:
263273
provider: gcp
264274
machineType: n2-standard-4
265275
preemptible: true
276+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
266277
timeout_in_minutes: 60
267278
parallelism: 2
268279
retry:
@@ -278,6 +289,7 @@ steps:
278289
provider: gcp
279290
machineType: n2-standard-4
280291
preemptible: true
292+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
281293
timeout_in_minutes: 60
282294
parallelism: 2
283295
retry:
@@ -293,6 +305,7 @@ steps:
293305
provider: gcp
294306
machineType: n2-standard-4
295307
preemptible: true
308+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
296309
timeout_in_minutes: 60
297310
parallelism: 5
298311
retry:
@@ -308,6 +321,7 @@ steps:
308321
provider: gcp
309322
machineType: n2-standard-4
310323
preemptible: true
324+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
311325
timeout_in_minutes: 60
312326
parallelism: 3
313327
retry:
@@ -323,6 +337,7 @@ steps:
323337
provider: gcp
324338
machineType: n2-standard-4
325339
preemptible: true
340+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
326341
timeout_in_minutes: 60
327342
parallelism: 1
328343
retry:
@@ -338,6 +353,7 @@ steps:
338353
provider: gcp
339354
machineType: n2-standard-4
340355
preemptible: true
356+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
341357
timeout_in_minutes: 60
342358
parallelism: 2
343359
retry:
@@ -353,6 +369,7 @@ steps:
353369
provider: gcp
354370
machineType: n2-standard-4
355371
preemptible: true
372+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
356373
timeout_in_minutes: 60
357374
parallelism: 3
358375
retry:
@@ -368,6 +385,7 @@ steps:
368385
provider: gcp
369386
machineType: n2-standard-4
370387
preemptible: true
388+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
371389
timeout_in_minutes: 60
372390
parallelism: 8
373391
retry:
@@ -383,6 +401,7 @@ steps:
383401
provider: gcp
384402
machineType: n2-standard-4
385403
preemptible: true
404+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
386405
timeout_in_minutes: 60
387406
parallelism: 8
388407
retry:
@@ -398,6 +417,9 @@ steps:
398417
provider: gcp
399418
enableNestedVirtualization: true
400419
machineType: n2-standard-4
420+
diskSizeGb: 105
421+
preemptible: true
422+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
401423
timeout_in_minutes: 75
402424
parallelism: 20
403425
retry:
@@ -412,8 +434,10 @@ steps:
412434
imageProject: elastic-images-prod
413435
provider: gcp
414436
machineType: n2-standard-4
437+
diskSizeGb: 105
415438
preemptible: true
416-
timeout_in_minutes: 120
439+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
440+
timeout_in_minutes: 75
417441
parallelism: 3
418442
retry:
419443
automatic:
@@ -428,6 +452,7 @@ steps:
428452
provider: gcp
429453
machineType: n2-standard-4
430454
preemptible: true
455+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
431456
timeout_in_minutes: 120
432457
parallelism: 3
433458
retry:
@@ -452,6 +477,7 @@ steps:
452477
provider: gcp
453478
machineType: n2-standard-8
454479
preemptible: true
480+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
455481
key: storybooks
456482
timeout_in_minutes: 80
457483
retry:
@@ -467,6 +493,7 @@ steps:
467493
provider: gcp
468494
machineType: n2-standard-2
469495
preemptible: true
496+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
470497
timeout_in_minutes: 60
471498
soft_fail: true
472499
retry:
@@ -482,6 +509,7 @@ steps:
482509
provider: gcp
483510
machineType: n2-standard-4
484511
preemptible: true
512+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
485513
artifact_paths: 'target/plugin_so_types_snapshot.json'
486514
timeout_in_minutes: 30
487515
retry:

‎.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

‎.buildkite/pipelines/pull_request/base.yml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ steps:
2424
agents:
2525
machineType: n2-standard-8
2626
preemptible: true
27+
spotZones: us-central1-c,us-central1-b,us-central1-a
2728
diskSizeGb: 150
2829
key: build
2930
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
@@ -38,6 +39,7 @@ steps:
3839
agents:
3940
machineType: n2-highcpu-8
4041
preemptible: true
42+
spotZones: us-central1-c,us-central1-b,us-central1-a
4143
diskSizeGb: 105
4244
key: quick_checks
4345
timeout_in_minutes: 60
@@ -52,6 +54,7 @@ steps:
5254
agents:
5355
machineType: n2-standard-2
5456
preemptible: true
57+
spotZones: us-central1-c,us-central1-b,us-central1-a
5558
diskSizeGb: 105
5659
timeout_in_minutes: 60
5760
retry:
@@ -64,6 +67,7 @@ steps:
6467
agents:
6568
machineType: n2-standard-16
6669
preemptible: true
70+
spotZones: us-central1-c,us-central1-b,us-central1-a
6771
diskSizeGb: 105
6872
key: linting
6973
timeout_in_minutes: 60
@@ -77,6 +81,7 @@ steps:
7781
agents:
7882
machineType: n2-standard-32
7983
preemptible: true
84+
spotZones: us-central1-c,us-central1-b,us-central1-a
8085
diskSizeGb: 105
8186
key: linting_with_types
8287
timeout_in_minutes: 60
@@ -90,6 +95,7 @@ steps:
9095
agents:
9196
machineType: n2-standard-4
9297
preemptible: true
98+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
9399
key: check_oas_snapshot
94100
timeout_in_minutes: 60
95101
retry:
@@ -101,9 +107,9 @@ steps:
101107
label: 'Check Types'
102108
agents:
103109
machineType: c4-standard-4
104-
diskType: 'hyperdisk-balanced'
110+
diskType: hyperdisk-balanced
105111
preemptible: true
106-
spotZones: us-central1-a,us-central1-b,us-central1-c
112+
spotZones: us-central1-c,us-central1-b,us-central1-a
107113
diskSizeGb: 105
108114
key: check_types
109115
timeout_in_minutes: 60
@@ -132,6 +138,7 @@ steps:
132138
agents:
133139
machineType: n2-highmem-4
134140
preemptible: true
141+
spotZones: us-central1-f,us-central1-c,us-central1-b,us-central1-a
135142
diskSizeGb: 105
136143
key: build_api_docs
137144
timeout_in_minutes: 90

‎.buildkite/pipelines/pull_request/base_merged_phases.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ steps:
9292
label: 'Check Types'
9393
agents:
9494
machineType: c4-standard-4
95-
diskType: 'hyperdisk-balanced'
95+
diskType: hyperdisk-balanced
9696
preemptible: true
97-
spotZones: us-central1-a,us-central1-b,us-central1-c
97+
spotZones: us-central1-c,us-central1-b,us-central1-a
9898
diskSizeGb: 115
9999
key: check_types
100100
timeout_in_minutes: 60

0 commit comments

Comments
 (0)