Skip to content

Commit 25b428a

Browse files
nikita-lavrovnikita-lavrov
authored
Merge branch '9.3' into backport/9.3/pr-251898
2 parents f8e8ec4 + 7386347 commit 25b428a

3 files changed

Lines changed: 33 additions & 48 deletions

File tree

‎.buildkite/pipelines/on_merge.yml‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,10 @@ steps:
3636
image: family/kibana-ubuntu-2404
3737
imageProject: elastic-images-prod
3838
provider: gcp
39-
machineType: n2-standard-8
39+
machineType: n4d-standard-16
40+
diskType: hyperdisk-balanced
4041
preemptible: true
41-
spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
42+
spotZones: us-central1-c,us-central1-a
4243
key: build
4344
timeout_in_minutes: 60
4445
retry:
@@ -52,10 +53,11 @@ steps:
5253
image: family/kibana-ubuntu-2404
5354
imageProject: elastic-images-prod
5455
provider: gcp
55-
machineType: n2-highcpu-8
56+
machineType: n4d-standard-8
57+
diskType: hyperdisk-balanced
5658
preemptible: true
59+
spotZones: us-central1-c,us-central1-a
5760
diskSizeGb: 105
58-
spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
5961
timeout_in_minutes: 60
6062
retry:
6163
automatic:
@@ -68,7 +70,8 @@ steps:
6870
image: family/kibana-ubuntu-2404
6971
imageProject: elastic-images-prod
7072
provider: gcp
71-
machineType: n2-standard-2
73+
machineType: n4d-standard-2
74+
diskType: hyperdisk-balanced
7275
preemptible: true
7376
spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
7477
diskSizeGb: 105
@@ -84,7 +87,8 @@ steps:
8487
image: family/kibana-ubuntu-2404
8588
imageProject: elastic-images-prod
8689
provider: gcp
87-
machineType: n2-standard-16
90+
machineType: n4d-standard-16
91+
diskType: hyperdisk-balanced
8892
preemptible: true
8993
spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
9094
diskSizeGb: 105
@@ -100,7 +104,8 @@ steps:
100104
image: family/kibana-ubuntu-2404
101105
imageProject: elastic-images-prod
102106
provider: gcp
103-
machineType: n2-standard-32
107+
machineType: n4d-standard-32
108+
diskType: hyperdisk-balanced
104109
preemptible: true
105110
spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
106111
diskSizeGb: 105
@@ -116,10 +121,10 @@ steps:
116121
image: family/kibana-ubuntu-2404
117122
imageProject: elastic-images-prod
118123
provider: gcp
119-
machineType: c4-standard-4
124+
machineType: n4d-standard-4
120125
diskType: hyperdisk-balanced
121126
preemptible: true
122-
spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
127+
spotZones: us-central1-c,us-central1-a
123128
diskSizeGb: 105
124129
timeout_in_minutes: 60
125130
retry:

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

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ steps:
2222
- command: .buildkite/scripts/steps/build_kibana.sh
2323
label: Build Kibana Distribution
2424
agents:
25-
machineType: n2-standard-8
25+
machineType: c4d-standard-16
26+
diskType: hyperdisk-balanced
2627
preemptible: true
27-
spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
28+
spotZones: us-central1-c,us-central1-a
2829
diskSizeGb: 200
2930
key: build
3031
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
@@ -37,9 +38,10 @@ steps:
3738
- command: .buildkite/scripts/steps/quick_checks.sh
3839
label: 'Quick Checks'
3940
agents:
40-
machineType: n2-highcpu-8
41+
machineType: c4d-standard-8
42+
diskType: hyperdisk-balanced
4143
preemptible: true
42-
spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
44+
spotZones: us-central1-c,us-central1-a
4345
diskSizeGb: 105
4446
key: quick_checks
4547
timeout_in_minutes: 60
@@ -52,9 +54,10 @@ steps:
5254
label: 'Checks'
5355
key: checks
5456
agents:
55-
machineType: n2-standard-2
57+
machineType: c4d-standard-2
58+
diskType: hyperdisk-balanced
5659
preemptible: true
57-
spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
60+
spotZones: us-central1-c,us-central1-a
5861
diskSizeGb: 105
5962
timeout_in_minutes: 60
6063
retry:
@@ -65,9 +68,10 @@ steps:
6568
- command: .buildkite/scripts/steps/lint.sh
6669
label: 'Linting'
6770
agents:
68-
machineType: n2-standard-16
71+
machineType: c4d-standard-16
72+
diskType: hyperdisk-balanced
6973
preemptible: true
70-
spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
74+
spotZones: us-central1-c,us-central1-a
7175
diskSizeGb: 105
7276
key: linting
7377
timeout_in_minutes: 60
@@ -79,9 +83,10 @@ steps:
7983
- command: .buildkite/scripts/steps/lint_with_types.sh
8084
label: 'Linting (with types)'
8185
agents:
82-
machineType: n2-standard-32
86+
machineType: c4d-standard-32
87+
diskType: hyperdisk-balanced
8388
preemptible: true
84-
spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
89+
spotZones: us-central1-c,us-central1-a
8590
diskSizeGb: 105
8691
key: linting_with_types
8792
timeout_in_minutes: 60
@@ -106,10 +111,10 @@ steps:
106111
- command: .buildkite/scripts/steps/typecheck/check_types.sh
107112
label: 'Check Types'
108113
agents:
109-
machineType: c4-standard-4
114+
machineType: c4d-standard-4
110115
diskType: hyperdisk-balanced
111116
preemptible: true
112-
spotZones: northamerica-northeast2-b,us-central1-c,us-central1-a
117+
spotZones: us-central1-c,us-central1-a
113118
diskSizeGb: 105
114119
key: check_types
115120
timeout_in_minutes: 60

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

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -512,36 +512,11 @@ const SKIPPABLE_PR_MATCHERS = prConfig.skip_ci_on_only_changed!.map((r) => new R
512512
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/check_saved_objects.yml'));
513513
}
514514

515-
if (
516-
(await doAnyChangesMatch([
517-
/^packages\/kbn-babel-preset/,
518-
/^packages\/kbn-repo-file-maps/,
519-
/^src\/platform\/packages\/private\/kbn-babel-transform/,
520-
/^src\/platform\/packages\/private\/kbn-import-resolver/,
521-
/^src\/platform\/packages\/private\/kbn-jest-serializers/,
522-
/^src\/platform\/packages\/private\/kbn-repo-packages/,
523-
/^src\/platform\/packages\/shared\/kbn-babel-register/,
524-
/^src\/platform\/packages\/shared\/kbn-jest-benchmarks/,
525-
/^src\/platform\/packages\/shared\/kbn-repo-info/,
526-
/^src\/platform\/packages\/shared\/kbn-test/,
527-
/^src\/setup_node_env/,
528-
])) ||
529-
GITHUB_PR_LABELS.includes('ci:bench-jest')
530-
) {
515+
if (GITHUB_PR_LABELS.includes('ci:bench-jest')) {
531516
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/jest_bench.yml'));
532517
}
533518

534-
if (
535-
(await doAnyChangesMatch([
536-
/^src\/platform\/packages\/shared\/kbn-es/,
537-
/^src\/platform\/packages\/shared\/kbn-ftr-benchmarks/,
538-
/^src\/platform\/packages\/shared\/kbn-ftr-common-functional-services/,
539-
/^src\/platform\/packages\/shared\/kbn-ftr-common-functional-ui-services/,
540-
/^src\/platform\/packages\/shared\/kbn-test/,
541-
/^src\/setup_node_env/,
542-
])) ||
543-
GITHUB_PR_LABELS.includes('ci:bench-ftr')
544-
) {
519+
if (GITHUB_PR_LABELS.includes('ci:bench-ftr')) {
545520
pipeline.push(getPipeline('.buildkite/pipelines/pull_request/ftr_bench.yml'));
546521
}
547522

0 commit comments

Comments
 (0)