Skip to content

Commit 1baadfc

Browse files
elasticmachineelasticmachine
authored
Merge branch 'main' into ml-dfa-remove-css-overrides
2 parents da4a636 + e827873 commit 1baadfc

2,015 files changed

Lines changed: 35239 additions & 16107 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_stateful_configs.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ enabled:
3030
- x-pack/test/api_integration/apis/metrics_ui/config.ts
3131
- x-pack/test/api_integration/apis/osquery/config.ts
3232
- x-pack/test/api_integration/apis/synthetics/config.ts
33-
- x-pack/test/api_integration/apis/slos/config.ts
3433
- x-pack/test/api_integration/apis/uptime/config.ts
3534
- x-pack/test/api_integration/apis/entity_manager/config.ts
3635
- x-pack/test/apm_api_integration/basic/config.ts

‎.buildkite/ftr_platform_stateful_configs.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ enabled:
249249
- x-pack/test/functional/apps/ml/permissions/config.ts
250250
- x-pack/test/functional/apps/ml/short_tests/config.ts
251251
- x-pack/test/functional/apps/ml/stack_management_jobs/config.ts
252+
- x-pack/test/functional/apps/ml/memory_usage/config.ts
252253
- x-pack/test/functional/apps/monitoring/config.ts
253254
- x-pack/test/functional/apps/painless_lab/config.ts
254255
- x-pack/test/functional/apps/remote_clusters/config.ts
@@ -341,7 +342,7 @@ enabled:
341342
- x-pack/test/spaces_api_integration/security_and_spaces/config_trial.ts
342343
- x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_trial.ts
343344
- x-pack/test/spaces_api_integration/spaces_only/config.ts
344-
- x-pack/test/task_manager_claimer_mget/config.ts
345+
- x-pack/test/task_manager_claimer_update_by_query/config.ts
345346
- x-pack/test/ui_capabilities/security_and_spaces/config.ts
346347
- x-pack/test/ui_capabilities/spaces_only/config.ts
347348
- x-pack/test/upgrade_assistant_integration/config.ts

‎.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ spec:
6262
message: Daily build
6363
branch: '8.15'
6464
Daily build (7.17):
65-
cronline: 0 22 * * * America/New_York
65+
cronline: 0 20 * * * America/New_York
6666
message: Daily build
6767
branch: '7.17'
6868
tags:

‎.buildkite/pipelines/on_merge.yml‎

Lines changed: 72 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,36 @@ steps:
4646
- exit_status: '-1'
4747
limit: 3
4848

49+
- command: .buildkite/scripts/steps/lint.sh
50+
label: 'Linting'
51+
agents:
52+
image: family/kibana-ubuntu-2004
53+
imageProject: elastic-images-prod
54+
provider: gcp
55+
machineType: n2-standard-16
56+
preemptible: true
57+
key: linting
58+
timeout_in_minutes: 60
59+
retry:
60+
automatic:
61+
- exit_status: '-1'
62+
limit: 3
63+
64+
- command: .buildkite/scripts/steps/lint_with_types.sh
65+
label: 'Linting (with types)'
66+
agents:
67+
image: family/kibana-ubuntu-2004
68+
imageProject: elastic-images-prod
69+
provider: gcp
70+
machineType: n2-standard-32
71+
preemptible: true
72+
key: linting_with_types
73+
timeout_in_minutes: 90
74+
retry:
75+
automatic:
76+
- exit_status: '-1'
77+
limit: 3
78+
4979
- wait
5080

5181
- command: .buildkite/scripts/steps/on_merge_api_docs.sh
@@ -109,6 +139,8 @@ steps:
109139
depends_on:
110140
- build
111141
- quick_checks
142+
- linting
143+
- linting_with_types
112144
timeout_in_minutes: 60
113145
parallelism: 3
114146
retry:
@@ -127,6 +159,8 @@ steps:
127159
depends_on:
128160
- build
129161
- quick_checks
162+
- linting
163+
- linting_with_types
130164
timeout_in_minutes: 60
131165
parallelism: 2
132166
retry:
@@ -145,6 +179,8 @@ steps:
145179
depends_on:
146180
- build
147181
- quick_checks
182+
- linting
183+
- linting_with_types
148184
timeout_in_minutes: 60
149185
parallelism: 8
150186
retry:
@@ -163,6 +199,8 @@ steps:
163199
depends_on:
164200
- build
165201
- quick_checks
202+
- linting
203+
- linting_with_types
166204
timeout_in_minutes: 60
167205
parallelism: 5
168206
retry:
@@ -181,6 +219,8 @@ steps:
181219
depends_on:
182220
- build
183221
- quick_checks
222+
- linting
223+
- linting_with_types
184224
timeout_in_minutes: 60
185225
parallelism: 1
186226
retry:
@@ -199,6 +239,8 @@ steps:
199239
depends_on:
200240
- build
201241
- quick_checks
242+
- linting
243+
- linting_with_types
202244
timeout_in_minutes: 60
203245
parallelism: 4
204246
retry:
@@ -217,6 +259,8 @@ steps:
217259
depends_on:
218260
- build
219261
- quick_checks
262+
- linting
263+
- linting_with_types
220264
timeout_in_minutes: 60
221265
parallelism: 6
222266
retry:
@@ -235,6 +279,8 @@ steps:
235279
depends_on:
236280
- build
237281
- quick_checks
282+
- linting
283+
- linting_with_types
238284
timeout_in_minutes: 60
239285
parallelism: 5
240286
retry:
@@ -253,6 +299,8 @@ steps:
253299
depends_on:
254300
- build
255301
- quick_checks
302+
- linting
303+
- linting_with_types
256304
timeout_in_minutes: 60
257305
parallelism: 6
258306
retry:
@@ -271,6 +319,8 @@ steps:
271319
depends_on:
272320
- build
273321
- quick_checks
322+
- linting
323+
- linting_with_types
274324
timeout_in_minutes: 60
275325
parallelism: 5
276326
retry:
@@ -289,6 +339,8 @@ steps:
289339
depends_on:
290340
- build
291341
- quick_checks
342+
- linting
343+
- linting_with_types
292344
timeout_in_minutes: 60
293345
parallelism: 6
294346
retry:
@@ -307,6 +359,8 @@ steps:
307359
depends_on:
308360
- build
309361
- quick_checks
362+
- linting
363+
- linting_with_types
310364
timeout_in_minutes: 60
311365
parallelism: 1
312366
retry:
@@ -325,6 +379,8 @@ steps:
325379
depends_on:
326380
- build
327381
- quick_checks
382+
- linting
383+
- linting_with_types
328384
timeout_in_minutes: 60
329385
parallelism: 1
330386
retry:
@@ -343,6 +399,8 @@ steps:
343399
depends_on:
344400
- build
345401
- quick_checks
402+
- linting
403+
- linting_with_types
346404
timeout_in_minutes: 60
347405
parallelism: 2
348406
retry:
@@ -361,6 +419,8 @@ steps:
361419
depends_on:
362420
- build
363421
- quick_checks
422+
- linting
423+
- linting_with_types
364424
timeout_in_minutes: 60
365425
parallelism: 2
366426
retry:
@@ -379,6 +439,8 @@ steps:
379439
depends_on:
380440
- build
381441
- quick_checks
442+
- linting
443+
- linting_with_types
382444
timeout_in_minutes: 60
383445
parallelism: 6
384446
retry:
@@ -397,6 +459,8 @@ steps:
397459
depends_on:
398460
- build
399461
- quick_checks
462+
- linting
463+
- linting_with_types
400464
timeout_in_minutes: 60
401465
parallelism: 8
402466
retry:
@@ -415,6 +479,8 @@ steps:
415479
depends_on:
416480
- build
417481
- quick_checks
482+
- linting
483+
- linting_with_types
418484
timeout_in_minutes: 60
419485
parallelism: 8
420486
retry:
@@ -435,6 +501,8 @@ steps:
435501
depends_on:
436502
- build
437503
- quick_checks
504+
- linting
505+
- linting_with_types
438506
timeout_in_minutes: 60
439507
parallelism: 20
440508
retry:
@@ -455,6 +523,8 @@ steps:
455523
depends_on:
456524
- build
457525
- quick_checks
526+
- linting
527+
- linting_with_types
458528
timeout_in_minutes: 60
459529
parallelism: 14
460530
retry:
@@ -468,42 +538,14 @@ steps:
468538
depends_on:
469539
- build
470540
- quick_checks
541+
- linting
542+
- linting_with_types
471543
agents:
472544
image: family/kibana-ubuntu-2004
473545
imageProject: elastic-images-prod
474546
provider: gcp
475547
machineType: n2-standard-2
476548

477-
- command: .buildkite/scripts/steps/lint.sh
478-
label: 'Linting'
479-
agents:
480-
image: family/kibana-ubuntu-2004
481-
imageProject: elastic-images-prod
482-
provider: gcp
483-
machineType: n2-standard-8
484-
preemptible: true
485-
key: linting
486-
timeout_in_minutes: 60
487-
retry:
488-
automatic:
489-
- exit_status: '-1'
490-
limit: 3
491-
492-
- command: .buildkite/scripts/steps/lint_with_types.sh
493-
label: 'Linting (with types)'
494-
agents:
495-
image: family/kibana-ubuntu-2004
496-
imageProject: elastic-images-prod
497-
provider: gcp
498-
machineType: n2-standard-16
499-
preemptible: true
500-
key: linting_with_types
501-
timeout_in_minutes: 90
502-
retry:
503-
automatic:
504-
- exit_status: '-1'
505-
limit: 3
506-
507549
- command: .buildkite/scripts/steps/checks.sh
508550
label: 'Checks'
509551
agents:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ steps:
77
depends_on:
88
- build
99
- quick_checks
10+
- linting
11+
- linting_with_types
1012
timeout_in_minutes: 120
1113
parallelism: 1 # TODO: Set parallelism when apm_cypress handles it
1214
retry:

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

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,30 @@ steps:
3232
- exit_status: '-1'
3333
limit: 3
3434

35+
- command: .buildkite/scripts/steps/lint.sh
36+
label: 'Linting'
37+
agents:
38+
machineType: n2-standard-16
39+
preemptible: true
40+
key: linting
41+
timeout_in_minutes: 60
42+
retry:
43+
automatic:
44+
- exit_status: '-1'
45+
limit: 3
46+
47+
- command: .buildkite/scripts/steps/lint_with_types.sh
48+
label: 'Linting (with types)'
49+
agents:
50+
machineType: n2-standard-32
51+
preemptible: true
52+
key: linting_with_types
53+
timeout_in_minutes: 90
54+
retry:
55+
automatic:
56+
- exit_status: '-1'
57+
limit: 3
58+
3559
- wait
3660

3761
- command: .buildkite/scripts/steps/ci_stats_ready.sh
@@ -61,18 +85,6 @@ steps:
6185
- exit_status: '*'
6286
limit: 1
6387

64-
- command: .buildkite/scripts/steps/lint.sh
65-
label: 'Linting'
66-
agents:
67-
machineType: n2-standard-8
68-
preemptible: true
69-
key: linting
70-
timeout_in_minutes: 60
71-
retry:
72-
automatic:
73-
- exit_status: '-1'
74-
limit: 3
75-
7688
- command: .buildkite/scripts/steps/check_types.sh
7789
label: 'Check Types'
7890
agents:
@@ -85,18 +97,6 @@ steps:
8597
- exit_status: '-1'
8698
limit: 3
8799

88-
- command: .buildkite/scripts/steps/lint_with_types.sh
89-
label: 'Linting (with types)'
90-
agents:
91-
machineType: n2-standard-16
92-
preemptible: true
93-
key: linting_with_types
94-
timeout_in_minutes: 90
95-
retry:
96-
automatic:
97-
- exit_status: '-1'
98-
limit: 3
99-
100100
- command: .buildkite/scripts/steps/checks.sh
101101
label: 'Checks'
102102
key: checks

‎.buildkite/pipelines/pull_request/deploy_cloud.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ steps:
77
depends_on:
88
- build
99
- quick_checks
10+
- linting
11+
- linting_with_types
1012
timeout_in_minutes: 30
1113
soft_fail: true
1214
retry:

‎.buildkite/pipelines/pull_request/exploratory_view_plugin.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ steps:
77
depends_on:
88
- build
99
- quick_checks
10+
- linting
11+
- linting_with_types
1012
timeout_in_minutes: 60
1113
artifact_paths:
1214
- 'x-pack/plugins/observability_solution/exploratory_view/e2e/.journeys/**/*'

0 commit comments

Comments
 (0)