Skip to content

Commit 0140d0c

Browse files
tfcmarquestfcmarques
authored
Merge branch 'main' into 5115-explore-trace-id-from-logs-in-Discover
2 parents 6846f01 + 6ad617a commit 0140d0c

1,658 files changed

Lines changed: 107259 additions & 10432 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_platform_stateful_configs.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ disabled:
55

66
# Base config files, only necessary to inform config finding script
77
- src/platform/test/functional/config.base.js
8+
- src/platform/test/functional/config.base.http2.ts
89
- src/platform/test/functional/firefox/config.base.ts
910
- x-pack/platform/test/functional/config.base.ts
1011
- x-pack/platform/test/localization/config.base.ts
@@ -357,9 +358,7 @@ enabled:
357358
- x-pack/performance/journeys_e2e/promotion_tracking_dashboard.ts
358359
- x-pack/performance/journeys_e2e/web_logs_dashboard.ts
359360
- x-pack/performance/journeys_e2e/web_logs_dashboard_esql.ts
360-
- x-pack/performance/journeys_e2e/web_logs_dashboard_dataview.ts
361361
- x-pack/performance/journeys_e2e/data_stress_test_lens.ts
362-
- x-pack/performance/journeys_e2e/data_stress_test_lens_http2.ts
363362
- x-pack/performance/journeys_e2e/ecommerce_dashboard_saved_search_only.ts
364363
- x-pack/performance/journeys_e2e/ecommerce_dashboard_tsvb_gauge_only.ts
365364
- x-pack/performance/journeys_e2e/dashboard_listing_page.ts

‎.buildkite/pipelines/chrome_forward_testing.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -429,7 +429,7 @@ steps:
429429
diskSizeGb: 105
430430
depends_on:
431431
- build
432-
timeout_in_minutes: 60
432+
timeout_in_minutes: 75
433433
parallelism: 20
434434
retry:
435435
automatic:
@@ -444,7 +444,7 @@ steps:
444444
diskSizeGb: 105
445445
depends_on:
446446
- build
447-
timeout_in_minutes: 60
447+
timeout_in_minutes: 75
448448
parallelism: 14
449449
retry:
450450
automatic:

‎.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ steps:
296296
machineType: n2-standard-4
297297
diskSizeGb: 105
298298
depends_on: build
299-
timeout_in_minutes: 60
299+
timeout_in_minutes: 75
300300
parallelism: 12
301301
retry:
302302
automatic:

‎.buildkite/pipelines/fleet/package_registry.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ steps:
7676
enableNestedVirtualization: true
7777
machineType: n2-standard-4
7878
diskSizeGb: 105
79-
timeout_in_minutes: 60
79+
timeout_in_minutes: 75
8080
parallelism: 20
8181
key: defend-workflows-stateful
8282
depends_on: build
@@ -94,7 +94,7 @@ steps:
9494
enableNestedVirtualization: true
9595
machineType: n2-standard-4
9696
diskSizeGb: 105
97-
timeout_in_minutes: 60
97+
timeout_in_minutes: 75
9898
parallelism: 14
9999
key: defend-workflows-serverless
100100
depends_on: build

‎.buildkite/pipelines/node_glibc_217.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ steps:
486486
diskSizeGb: 105
487487
depends_on:
488488
- build
489-
timeout_in_minutes: 60
489+
timeout_in_minutes: 75
490490
parallelism: 20
491491
retry:
492492
automatic:
@@ -504,7 +504,7 @@ steps:
504504
diskSizeGb: 105
505505
depends_on:
506506
- build
507-
timeout_in_minutes: 60
507+
timeout_in_minutes: 75
508508
parallelism: 14
509509
retry:
510510
automatic:

‎.buildkite/pipelines/node_pointer_compression.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ steps:
488488
diskSizeGb: 105
489489
depends_on:
490490
- build
491-
timeout_in_minutes: 60
491+
timeout_in_minutes: 75
492492
parallelism: 20
493493
retry:
494494
automatic:
@@ -506,7 +506,7 @@ steps:
506506
diskSizeGb: 105
507507
depends_on:
508508
- build
509-
timeout_in_minutes: 60
509+
timeout_in_minutes: 75
510510
parallelism: 14
511511
retry:
512512
automatic:

‎.buildkite/pipelines/pull_request/ftr_bench.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
steps:
2+
- command: .buildkite/scripts/steps/ftr_bench.sh
3+
label: 'FTR Bench'
4+
agents:
5+
machineType: c2d-standard-16
6+
zones: us-central1-a,us-central1-b,us-central1-c
7+
diskSizeGb: 200
8+
key: ftr_bench
9+
timeout_in_minutes: 120
10+
soft_fail: true

‎.buildkite/pipelines/pull_request/jest_bench.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,3 @@ steps:
77
key: jest_bench
88
timeout_in_minutes: 60
99
soft_fail: true
10-
depends_on:
11-
- build
12-
- quick_checks
13-
- checks
14-
- linting
15-
- linting_with_types
16-
- check_types
17-
- check_oas_snapshot

‎.buildkite/pipelines/pull_request/security_solution/cypress_burn.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ steps:
1212
- linting_with_types
1313
- check_types
1414
- check_oas_snapshot
15-
timeout_in_minutes: 60
15+
timeout_in_minutes: 75
1616
soft_fail: true
1717
parallelism: 1
1818
retry:
@@ -31,7 +31,7 @@ steps:
3131
- linting_with_types
3232
- check_types
3333
- check_oas_snapshot
34-
timeout_in_minutes: 60
34+
timeout_in_minutes: 75
3535
soft_fail: true
3636
parallelism: 1
3737
retry:

‎.buildkite/scripts/pipelines/pull_request/pipeline.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,20 @@ const SKIPPABLE_PR_MATCHERS = prConfig.skip_ci_on_only_changed!.map((r) => new R
549549
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/jest_bench.yml'));
550550
}
551551

552+
if (
553+
(await doAnyChangesMatch([
554+
/^src\/platform\/packages\/shared\/kbn-es/,
555+
/^src\/platform\/packages\/shared\/kbn-ftr-benchmarks/,
556+
/^src\/platform\/packages\/shared\/kbn-ftr-common-functional-services/,
557+
/^src\/platform\/packages\/shared\/kbn-ftr-common-functional-ui-services/,
558+
/^src\/platform\/packages\/shared\/kbn-test/,
559+
/^src\/setup_node_env/,
560+
])) ||
561+
GITHUB_PR_LABELS.includes('ci:bench-ftr')
562+
) {
563+
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/ftr_bench.yml'));
564+
}
565+
552566
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/post_build.yml'));
553567

554568
emitPipeline(pipeline);

0 commit comments

Comments
 (0)