Skip to content

Commit dc4b123

Browse files
committed
Merge remote-tracking branch 'upstream/main' into task/exceptions-warning
2 parents 370f16a + 227aaf3 commit dc4b123

1,268 files changed

Lines changed: 14916 additions & 6171 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: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,23 @@ enabled:
4545
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/serverless.config.ts
4646
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/configs/serverless.config.ts
4747
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/configs/serverless.config.ts
48-
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/configs/serverless.config.ts
48+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_types/basic_license_essentials_tier/configs/serverless.config.ts
49+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/float/basic_license_essentials_tier/configs/serverless.config.ts
50+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/integer/basic_license_essentials_tier/configs/serverless.config.ts
51+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/double/basic_license_essentials_tier/configs/serverless.config.ts
4952
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/configs/serverless.config.ts
5053
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/configs/serverless.config.ts
5154
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/configs/serverless.config.ts
5255
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/configs/serverless.config.ts
5356
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/configs/serverless.config.ts
54-
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/trial_license_complete_tier/configs/serverless.config.ts
57+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/eql/trial_license_complete_tier/configs/serverless.config.ts
58+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/configs/serverless.config.ts
59+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/trial_license_complete_tier/configs/serverless.config.ts
60+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/configs/serverless.config.ts
61+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/configs/serverless.config.ts
62+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/configs/serverless.config.ts
63+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/query/trial_license_complete_tier/configs/serverless.config.ts
64+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/threshold/trial_license_complete_tier/configs/serverless.config.ts
5565
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_gaps/trial_license_complete_tier/configs/serverless.config.ts
5666
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/basic_license_essentials_tier/configs/serverless.config.ts
5767
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/trial_license_complete_tier/configs/serverless.config.ts

.buildkite/ftr_security_stateful_configs.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,23 @@ enabled:
3030
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/actions/trial_license_complete_tier/configs/ess.config.ts
3131
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/basic_license_essentials_tier/configs/ess.config.ts
3232
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/alerts/trial_license_complete_tier/configs/ess.config.ts
33-
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_numeric_types/basic_license_essentials_tier/configs/ess.config.ts
33+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/date_types/basic_license_essentials_tier/configs/ess.config.ts
34+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/float/basic_license_essentials_tier/configs/ess.config.ts
35+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/integer/basic_license_essentials_tier/configs/ess.config.ts
36+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/double/basic_license_essentials_tier/configs/ess.config.ts
3437
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/ips/basic_license_essentials_tier/configs/ess.config.ts
3538
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/keyword/basic_license_essentials_tier/configs/ess.config.ts
3639
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/long/basic_license_essentials_tier/configs/ess.config.ts
3740
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/operators_data_types/text/basic_license_essentials_tier/configs/ess.config.ts
3841
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/configs/ess.config.ts
39-
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/trial_license_complete_tier/configs/ess.config.ts
42+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/eql/trial_license_complete_tier/configs/ess.config.ts
43+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/esql/trial_license_complete_tier/configs/ess.config.ts
44+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/general_logic/trial_license_complete_tier/configs/ess.config.ts
45+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/indicator_match/trial_license_complete_tier/configs/ess.config.ts
46+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/machine_learning/trial_license_complete_tier/configs/ess.config.ts
47+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/new_terms/trial_license_complete_tier/configs/ess.config.ts
48+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/query/trial_license_complete_tier/configs/ess.config.ts
49+
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/threshold/trial_license_complete_tier/configs/ess.config.ts
4050
- x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_gaps/trial_license_complete_tier/configs/ess.config.ts
4151
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/basic_license_essentials_tier/configs/ess.config.ts
4252
- x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_creation/trial_license_complete_tier/configs/ess.config.ts

.buildkite/pipelines/on_merge.yml

Lines changed: 18 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ steps:
3939
provider: gcp
4040
machineType: n2-highcpu-8
4141
preemptible: true
42-
key: quick_checks
4342
timeout_in_minutes: 60
4443
retry:
4544
automatic:
@@ -54,7 +53,6 @@ steps:
5453
provider: gcp
5554
machineType: n2-standard-16
5655
preemptible: true
57-
key: linting
5856
timeout_in_minutes: 60
5957
retry:
6058
automatic:
@@ -69,8 +67,23 @@ steps:
6967
provider: gcp
7068
machineType: n2-standard-32
7169
preemptible: true
72-
key: linting_with_types
73-
timeout_in_minutes: 90
70+
timeout_in_minutes: 60
71+
retry:
72+
automatic:
73+
- exit_status: '-1'
74+
limit: 3
75+
76+
- command: .buildkite/scripts/steps/check_types.sh
77+
label: 'Check Types'
78+
agents:
79+
image: family/kibana-ubuntu-2004
80+
imageProject: elastic-images-prod
81+
provider: gcp
82+
machineType: c4-standard-4
83+
diskType: 'hyperdisk-balanced'
84+
preemptible: true
85+
spotZones: us-central1-a,us-central1-b,us-central1-c
86+
timeout_in_minutes: 60
7487
retry:
7588
automatic:
7689
- exit_status: '-1'
@@ -136,11 +149,6 @@ steps:
136149
provider: gcp
137150
machineType: n2-standard-4
138151
preemptible: true
139-
depends_on:
140-
- build
141-
- quick_checks
142-
- linting
143-
- linting_with_types
144152
timeout_in_minutes: 60
145153
parallelism: 3
146154
retry:
@@ -156,11 +164,6 @@ steps:
156164
provider: gcp
157165
machineType: n2-standard-4
158166
preemptible: true
159-
depends_on:
160-
- build
161-
- quick_checks
162-
- linting
163-
- linting_with_types
164167
timeout_in_minutes: 60
165168
parallelism: 2
166169
retry:
@@ -176,11 +179,6 @@ steps:
176179
provider: gcp
177180
machineType: n2-standard-4
178181
preemptible: true
179-
depends_on:
180-
- build
181-
- quick_checks
182-
- linting
183-
- linting_with_types
184182
timeout_in_minutes: 60
185183
parallelism: 8
186184
retry:
@@ -196,11 +194,6 @@ steps:
196194
provider: gcp
197195
machineType: n2-standard-4
198196
preemptible: true
199-
depends_on:
200-
- build
201-
- quick_checks
202-
- linting
203-
- linting_with_types
204197
timeout_in_minutes: 60
205198
parallelism: 5
206199
retry:
@@ -216,11 +209,6 @@ steps:
216209
provider: gcp
217210
machineType: n2-standard-4
218211
preemptible: true
219-
depends_on:
220-
- build
221-
- quick_checks
222-
- linting
223-
- linting_with_types
224212
timeout_in_minutes: 60
225213
parallelism: 1
226214
retry:
@@ -236,11 +224,6 @@ steps:
236224
provider: gcp
237225
machineType: n2-standard-4
238226
preemptible: true
239-
depends_on:
240-
- build
241-
- quick_checks
242-
- linting
243-
- linting_with_types
244227
timeout_in_minutes: 60
245228
parallelism: 4
246229
retry:
@@ -256,11 +239,6 @@ steps:
256239
provider: gcp
257240
machineType: n2-standard-4
258241
preemptible: true
259-
depends_on:
260-
- build
261-
- quick_checks
262-
- linting
263-
- linting_with_types
264242
timeout_in_minutes: 60
265243
parallelism: 6
266244
retry:
@@ -276,11 +254,6 @@ steps:
276254
provider: gcp
277255
machineType: n2-standard-4
278256
preemptible: true
279-
depends_on:
280-
- build
281-
- quick_checks
282-
- linting
283-
- linting_with_types
284257
timeout_in_minutes: 60
285258
parallelism: 5
286259
retry:
@@ -296,11 +269,6 @@ steps:
296269
provider: gcp
297270
machineType: n2-standard-4
298271
preemptible: true
299-
depends_on:
300-
- build
301-
- quick_checks
302-
- linting
303-
- linting_with_types
304272
timeout_in_minutes: 60
305273
parallelism: 6
306274
retry:
@@ -316,11 +284,6 @@ steps:
316284
provider: gcp
317285
machineType: n2-standard-4
318286
preemptible: true
319-
depends_on:
320-
- build
321-
- quick_checks
322-
- linting
323-
- linting_with_types
324287
timeout_in_minutes: 60
325288
parallelism: 5
326289
retry:
@@ -336,11 +299,6 @@ steps:
336299
provider: gcp
337300
machineType: n2-standard-4
338301
preemptible: true
339-
depends_on:
340-
- build
341-
- quick_checks
342-
- linting
343-
- linting_with_types
344302
timeout_in_minutes: 60
345303
parallelism: 6
346304
retry:
@@ -356,11 +314,6 @@ steps:
356314
provider: gcp
357315
machineType: n2-standard-4
358316
preemptible: true
359-
depends_on:
360-
- build
361-
- quick_checks
362-
- linting
363-
- linting_with_types
364317
timeout_in_minutes: 60
365318
parallelism: 1
366319
retry:
@@ -376,11 +329,6 @@ steps:
376329
provider: gcp
377330
machineType: n2-standard-4
378331
preemptible: true
379-
depends_on:
380-
- build
381-
- quick_checks
382-
- linting
383-
- linting_with_types
384332
timeout_in_minutes: 60
385333
parallelism: 1
386334
retry:
@@ -396,11 +344,6 @@ steps:
396344
provider: gcp
397345
machineType: n2-standard-4
398346
preemptible: true
399-
depends_on:
400-
- build
401-
- quick_checks
402-
- linting
403-
- linting_with_types
404347
timeout_in_minutes: 60
405348
parallelism: 2
406349
retry:
@@ -416,11 +359,6 @@ steps:
416359
provider: gcp
417360
machineType: n2-standard-4
418361
preemptible: true
419-
depends_on:
420-
- build
421-
- quick_checks
422-
- linting
423-
- linting_with_types
424362
timeout_in_minutes: 60
425363
parallelism: 2
426364
retry:
@@ -436,11 +374,6 @@ steps:
436374
provider: gcp
437375
machineType: n2-standard-4
438376
preemptible: true
439-
depends_on:
440-
- build
441-
- quick_checks
442-
- linting
443-
- linting_with_types
444377
timeout_in_minutes: 60
445378
parallelism: 6
446379
retry:
@@ -456,11 +389,6 @@ steps:
456389
provider: gcp
457390
machineType: n2-standard-4
458391
preemptible: true
459-
depends_on:
460-
- build
461-
- quick_checks
462-
- linting
463-
- linting_with_types
464392
timeout_in_minutes: 60
465393
parallelism: 8
466394
retry:
@@ -476,11 +404,6 @@ steps:
476404
provider: gcp
477405
machineType: n2-standard-4
478406
preemptible: true
479-
depends_on:
480-
- build
481-
- quick_checks
482-
- linting
483-
- linting_with_types
484407
timeout_in_minutes: 60
485408
parallelism: 8
486409
retry:
@@ -498,11 +421,6 @@ steps:
498421
localSsds: 1
499422
localSsdInterface: nvme
500423
machineType: n2-standard-4
501-
depends_on:
502-
- build
503-
- quick_checks
504-
- linting
505-
- linting_with_types
506424
timeout_in_minutes: 60
507425
parallelism: 20
508426
retry:
@@ -520,11 +438,6 @@ steps:
520438
localSsds: 1
521439
localSsdInterface: nvme
522440
machineType: n2-standard-4
523-
depends_on:
524-
- build
525-
- quick_checks
526-
- linting
527-
- linting_with_types
528441
timeout_in_minutes: 60
529442
parallelism: 14
530443
retry:
@@ -535,11 +448,6 @@ steps:
535448
- command: '.buildkite/scripts/steps/functional/on_merge_unsupported_ftrs.sh'
536449
label: Trigger unsupported ftr tests
537450
timeout_in_minutes: 10
538-
depends_on:
539-
- build
540-
- quick_checks
541-
- linting
542-
- linting_with_types
543451
agents:
544452
image: family/kibana-ubuntu-2004
545453
imageProject: elastic-images-prod
@@ -560,27 +468,13 @@ steps:
560468
- exit_status: '-1'
561469
limit: 3
562470

563-
- command: .buildkite/scripts/steps/check_types.sh
564-
label: 'Check Types'
565-
agents:
566-
image: family/kibana-ubuntu-2004
567-
imageProject: elastic-images-prod
568-
provider: gcp
569-
machineType: n2-standard-4
570-
preemptible: true
571-
timeout_in_minutes: 70
572-
retry:
573-
automatic:
574-
- exit_status: '-1'
575-
limit: 3
576-
577471
- command: .buildkite/scripts/steps/checks/capture_oas_snapshot.sh
578472
label: 'Check OAS Snapshot'
579473
agents:
580474
image: family/kibana-ubuntu-2004
581475
imageProject: elastic-images-prod
582476
provider: gcp
583-
machineType: n2-standard-2
477+
machineType: n2-standard-4
584478
preemptible: true
585479
timeout_in_minutes: 60
586480
retry:

.buildkite/pipelines/pull_request/apm_cypress.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ steps:
99
- quick_checks
1010
- linting
1111
- linting_with_types
12+
- check_types
1213
timeout_in_minutes: 120
1314
parallelism: 1 # TODO: Set parallelism when apm_cypress handles it
1415
retry:

0 commit comments

Comments
 (0)