Skip to content

Commit 79ea1f8

Browse files
tylersmalleymistic
andauthored
[CI] Update regions and remove spot from build step (elastic#255437)
Seeing lots of errors being unable to get a VM in these regions with hyperdisk after 5 attempts, resulting in a failed job. Updates regions and remove spot from build step, as it blocks the rest of the pipeline. --------- Signed-off-by: Tyler Smalley <tyler.smalley@elastic.co> Co-authored-by: Tiago Costa <tiagoffcc@hotmail.com> Co-authored-by: Tiago Costa <tiago.costa@elastic.co>
1 parent dc4e6f2 commit 79ea1f8

2 files changed

Lines changed: 33 additions & 48 deletions

File tree

.buildkite/pipelines/on_merge.yml

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ steps:
3636
image: family/kibana-ubuntu-2404
3737
imageProject: elastic-images-prod
3838
provider: gcp
39-
machineType: n4d-standard-16
39+
machineType: c4d-standard-16
4040
diskType: hyperdisk-balanced
41-
preemptible: true
42-
spotZones: us-central1-c,us-central1-a
4341
key: build
4442
timeout_in_minutes: 60
4543
retry:
@@ -53,10 +51,9 @@ steps:
5351
image: family/kibana-ubuntu-2404
5452
imageProject: elastic-images-prod
5553
provider: gcp
56-
machineType: n4d-standard-8
57-
diskType: hyperdisk-balanced
54+
machineType: n2d-standard-8
5855
preemptible: true
59-
spotZones: us-central1-c,us-central1-a
56+
spotZones: us-central1-b,us-central1-c,us-central1-f
6057
diskSizeGb: 105
6158
key: quick_checks
6259
timeout_in_minutes: 60
@@ -71,10 +68,9 @@ steps:
7168
image: family/kibana-ubuntu-2404
7269
imageProject: elastic-images-prod
7370
provider: gcp
74-
machineType: n4d-standard-2
75-
diskType: hyperdisk-balanced
71+
machineType: n2d-standard-2
7672
preemptible: true
77-
spotZones: us-central1-c,us-central1-a
73+
spotZones: us-central1-b,us-central1-c,us-central1-f
7874
diskSizeGb: 105
7975
key: checks
8076
timeout_in_minutes: 60
@@ -89,10 +85,9 @@ steps:
8985
image: family/kibana-ubuntu-2404
9086
imageProject: elastic-images-prod
9187
provider: gcp
92-
machineType: n4d-standard-16
93-
diskType: hyperdisk-balanced
88+
machineType: n2d-standard-16
9489
preemptible: true
95-
spotZones: us-central1-c,us-central1-a
90+
spotZones: us-central1-b,us-central1-c,us-central1-f
9691
diskSizeGb: 105
9792
key: linting
9893
timeout_in_minutes: 60
@@ -107,10 +102,9 @@ steps:
107102
image: family/kibana-ubuntu-2404
108103
imageProject: elastic-images-prod
109104
provider: gcp
110-
machineType: n4d-standard-32
111-
diskType: hyperdisk-balanced
105+
machineType: n2d-standard-32
112106
preemptible: true
113-
spotZones: us-central1-c,us-central1-a
107+
spotZones: us-central1-b,us-central1-c,us-central1-f
114108
diskSizeGb: 105
115109
key: linting_with_types
116110
timeout_in_minutes: 60
@@ -128,7 +122,7 @@ steps:
128122
machineType: e2-standard-4
129123
diskType: pd-ssd
130124
preemptible: true
131-
spotZones: us-central1-c,us-central1-a
125+
spotZones: us-central1-b,us-central1-c,us-central1-f
132126
diskSizeGb: 105
133127
key: linting_with_oxlint
134128
timeout_in_minutes: 60
@@ -143,10 +137,9 @@ steps:
143137
image: family/kibana-ubuntu-2404
144138
imageProject: elastic-images-prod
145139
provider: gcp
146-
machineType: n4d-standard-4
147-
diskType: hyperdisk-balanced
140+
machineType: n2d-standard-2
148141
preemptible: true
149-
spotZones: us-central1-c,us-central1-a
142+
spotZones: us-central1-b,us-central1-c,us-central1-f
150143
diskSizeGb: 105
151144
key: check_types
152145
timeout_in_minutes: 60
@@ -161,10 +154,10 @@ steps:
161154
image: family/kibana-ubuntu-2404
162155
imageProject: elastic-images-prod
163156
provider: gcp
164-
machineType: c4d-standard-2
165-
diskType: hyperdisk-balanced
157+
machineType: n2d-highmem-4
166158
preemptible: true
167-
spotZones: us-central1-c,us-central1-a
159+
spotZones: us-central1-b,us-central1-c,us-central1-f
160+
diskSizeGb: 105
168161
key: check_oas_snapshot
169162
timeout_in_minutes: 60
170163
retry:
@@ -199,7 +192,7 @@ steps:
199192
provider: gcp
200193
machineType: n2-highmem-4
201194
preemptible: true
202-
spotZones: us-central1-f,us-central1-c,us-central1-a
195+
spotZones: us-central1-b,us-central1-c,us-central1-f
203196
diskSizeGb: 105
204197
timeout_in_minutes: 60
205198
retry:
@@ -302,7 +295,7 @@ steps:
302295
provider: gcp
303296
machineType: n2-standard-8
304297
preemptible: true
305-
spotZones: us-central1-f,us-central1-c,us-central1-a
298+
spotZones: us-central1-b,us-central1-c,us-central1-f
306299
key: storybooks
307300
depends_on:
308301
- build
@@ -320,7 +313,7 @@ steps:
320313
provider: gcp
321314
machineType: n2-standard-2
322315
preemptible: true
323-
spotZones: us-central1-f,us-central1-c,us-central1-a
316+
spotZones: us-central1-b,us-central1-c,us-central1-f
324317
depends_on:
325318
- build
326319
timeout_in_minutes: 60
@@ -338,7 +331,7 @@ steps:
338331
provider: gcp
339332
machineType: n2-standard-4
340333
preemptible: true
341-
spotZones: us-central1-f,us-central1-c,us-central1-a
334+
spotZones: us-central1-b,us-central1-c,us-central1-f
342335
artifact_paths: 'target/plugin_so_types_snapshot.json'
343336
depends_on:
344337
- build

.buildkite/pipelines/pull_request/base.yml

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ steps:
44
agents:
55
machineType: c4d-standard-16
66
diskType: hyperdisk-balanced
7-
preemptible: true
8-
spotZones: us-central1-c,us-central1-a
97
diskSizeGb: 200
108
key: build
119
if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''"
@@ -18,10 +16,9 @@ steps:
1816
- command: .buildkite/scripts/steps/quick_checks.sh
1917
label: 'Quick Checks'
2018
agents:
21-
machineType: c4d-standard-8
22-
diskType: hyperdisk-balanced
19+
machineType: n2d-standard-8
2320
preemptible: true
24-
spotZones: us-central1-c,us-central1-a
21+
spotZones: us-central1-b,us-central1-c,us-central1-f
2522
diskSizeGb: 105
2623
key: quick_checks
2724
timeout_in_minutes: 60
@@ -33,10 +30,9 @@ steps:
3330
- command: .buildkite/scripts/steps/checks.sh
3431
label: 'Checks'
3532
agents:
36-
machineType: c4d-standard-2
37-
diskType: hyperdisk-balanced
33+
machineType: n2d-standard-2
3834
preemptible: true
39-
spotZones: us-central1-c,us-central1-a
35+
spotZones: us-central1-b,us-central1-c,us-central1-f
4036
diskSizeGb: 105
4137
timeout_in_minutes: 60
4238
key: checks
@@ -48,10 +44,9 @@ steps:
4844
- command: .buildkite/scripts/steps/lint.sh
4945
label: 'Linting'
5046
agents:
51-
machineType: c4d-standard-16
52-
diskType: hyperdisk-balanced
47+
machineType: n2d-standard-16
5348
preemptible: true
54-
spotZones: us-central1-c,us-central1-a
49+
spotZones: us-central1-b,us-central1-c,us-central1-f
5550
diskSizeGb: 105
5651
key: linting
5752
timeout_in_minutes: 60
@@ -63,10 +58,9 @@ steps:
6358
- command: .buildkite/scripts/steps/lint_with_types.sh
6459
label: 'Linting (with types)'
6560
agents:
66-
machineType: c4d-standard-32
67-
diskType: hyperdisk-balanced
61+
machineType: n2d-standard-32
6862
preemptible: true
69-
spotZones: us-central1-c,us-central1-a
63+
spotZones: us-central1-b,us-central1-c,us-central1-f
7064
diskSizeGb: 105
7165
key: linting_with_types
7266
timeout_in_minutes: 60
@@ -81,7 +75,7 @@ steps:
8175
machineType: c4d-standard-32
8276
diskType: hyperdisk-balanced
8377
preemptible: true
84-
spotZones: us-central1-c,us-central1-a
78+
spotZones: us-central1-b,us-central1-c
8579
diskSizeGb: 105
8680
key: linting_with_oxlint
8781
timeout_in_minutes: 60
@@ -93,10 +87,9 @@ steps:
9387
- command: .buildkite/scripts/steps/checks/capture_oas_snapshot.sh
9488
label: 'Check OAS Snapshot'
9589
agents:
96-
machineType: c4d-standard-2
97-
diskType: hyperdisk-balanced
90+
machineType: n2d-standard-2
9891
preemptible: true
99-
spotZones: us-central1-c,us-central1-a
92+
spotZones: us-central1-b,us-central1-c,us-central1-f
10093
key: check_oas_snapshot
10194
timeout_in_minutes: 60
10295
retry:
@@ -107,10 +100,9 @@ steps:
107100
- command: .buildkite/scripts/steps/typecheck/check_types.sh
108101
label: 'Check Types'
109102
agents:
110-
machineType: c4d-highmem-4
111-
diskType: hyperdisk-balanced
103+
machineType: n2d-highmem-4
112104
preemptible: true
113-
spotZones: us-central1-c,us-central1-a
105+
spotZones: us-central1-b,us-central1-c,us-central1-f
114106
diskSizeGb: 105
115107
key: check_types
116108
timeout_in_minutes: 60
@@ -169,7 +161,7 @@ steps:
169161
agents:
170162
machineType: n2-highmem-4
171163
preemptible: true
172-
spotZones: us-central1-f,us-central1-c,us-central1-a
164+
spotZones: us-central1-b,us-central1-c,us-central1-f
173165
diskSizeGb: 105
174166
key: build_api_docs
175167
timeout_in_minutes: 60

0 commit comments

Comments
 (0)