Skip to content

Commit 9b6a28f

Browse files
brianseedersbrianseeders
authored
[7.17] [CI] Move default CI OS to ubuntu-2404 and drop ubuntu-2004 (#129008) (#129666)
* [CI] Move default CI OS to ubuntu-2404 and drop ubuntu-2004 (#129008) (cherry picked from commit e53592e) # Conflicts: # .buildkite/pipelines/ecs-dynamic-template-tests.yml # .buildkite/pipelines/intake.template.yml # .buildkite/pipelines/intake.yml # .buildkite/pipelines/lucene-snapshot/build-snapshot.yml # .buildkite/pipelines/lucene-snapshot/run-tests.yml # .buildkite/pipelines/periodic-fwc.template.yml # .buildkite/pipelines/periodic-fwc.yml # .buildkite/pipelines/periodic-micro-benchmarks.yml # .buildkite/pipelines/periodic-packaging.template.yml # .buildkite/pipelines/periodic-packaging.yml # .buildkite/pipelines/periodic-platform-support.yml # .buildkite/pipelines/periodic.template.yml # .buildkite/pipelines/periodic.yml # .buildkite/pipelines/pull-request/bwc-snapshots.yml # .buildkite/pipelines/pull-request/packaging-tests-unix.yml # .buildkite/pipelines/pull-request/part-1-arm.yml # .buildkite/pipelines/pull-request/part-2-arm.yml # .buildkite/pipelines/pull-request/part-3-arm.yml # .buildkite/pipelines/pull-request/part-3-fips.yml # .buildkite/pipelines/pull-request/part-3.yml # .buildkite/pipelines/pull-request/part-4-arm.yml # .buildkite/pipelines/pull-request/part-4-fips.yml # .buildkite/pipelines/pull-request/part-4.yml # .buildkite/pipelines/pull-request/part-5-arm.yml # .buildkite/pipelines/pull-request/part-5-fips.yml # .buildkite/pipelines/pull-request/part-5.yml # .buildkite/pipelines/pull-request/release-tests.yml # .buildkite/pipelines/pull-request/rest-compatibility.yml * Update release-tests.yml
1 parent e09b930 commit 9b6a28f

29 files changed

+115
-124
lines changed

‎.buildkite/pipelines/intake.template.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ steps:
44
timeout_in_minutes: 300
55
agents:
66
provider: gcp
7-
image: family/elasticsearch-ubuntu-2004
7+
image: family/elasticsearch-ubuntu-2404
88
machineType: custom-32-98304
99
buildDirectory: /dev/shm/bk
1010
- wait
@@ -13,15 +13,15 @@ steps:
1313
timeout_in_minutes: 300
1414
agents:
1515
provider: gcp
16-
image: family/elasticsearch-ubuntu-2004
16+
image: family/elasticsearch-ubuntu-2404
1717
machineType: n1-standard-32
1818
buildDirectory: /dev/shm/bk
1919
- label: part2
2020
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2
2121
timeout_in_minutes: 300
2222
agents:
2323
provider: gcp
24-
image: family/elasticsearch-ubuntu-2004
24+
image: family/elasticsearch-ubuntu-2404
2525
machineType: n1-standard-32
2626
buildDirectory: /dev/shm/bk
2727
- wait

‎.buildkite/pipelines/intake.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ steps:
55
timeout_in_minutes: 300
66
agents:
77
provider: gcp
8-
image: family/elasticsearch-ubuntu-2004
8+
image: family/elasticsearch-ubuntu-2404
99
machineType: custom-32-98304
1010
buildDirectory: /dev/shm/bk
1111
- wait
@@ -14,15 +14,15 @@ steps:
1414
timeout_in_minutes: 300
1515
agents:
1616
provider: gcp
17-
image: family/elasticsearch-ubuntu-2004
17+
image: family/elasticsearch-ubuntu-2404
1818
machineType: n1-standard-32
1919
buildDirectory: /dev/shm/bk
2020
- label: part2
2121
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files checkPart2
2222
timeout_in_minutes: 300
2323
agents:
2424
provider: gcp
25-
image: family/elasticsearch-ubuntu-2004
25+
image: family/elasticsearch-ubuntu-2404
2626
machineType: n1-standard-32
2727
buildDirectory: /dev/shm/bk
2828
- wait

‎.buildkite/pipelines/periodic-packaging.bwc.template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
setup:
66
image:
77
- rocky-8
8-
- ubuntu-2004
8+
- ubuntu-2404
99
agents:
1010
provider: gcp
1111
image: family/elasticsearch-{{matrix.image}}

‎.buildkite/pipelines/periodic-packaging.template.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ steps:
1515
- oraclelinux-9
1616
- sles-12
1717
- sles-15
18-
- ubuntu-1804
19-
- ubuntu-2004
2018
- ubuntu-2204
2119
- ubuntu-2404
2220
- rocky-8

‎.buildkite/pipelines/periodic-packaging.yml

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ steps:
1616
- oraclelinux-9
1717
- sles-12
1818
- sles-15
19-
- ubuntu-1804
20-
- ubuntu-2004
2119
- ubuntu-2204
2220
- ubuntu-2404
2321
- rocky-8
@@ -42,7 +40,7 @@ steps:
4240
setup:
4341
image:
4442
- rocky-8
45-
- ubuntu-2004
43+
- ubuntu-2404
4644
agents:
4745
provider: gcp
4846
image: family/elasticsearch-{{matrix.image}}
@@ -58,7 +56,7 @@ steps:
5856
setup:
5957
image:
6058
- rocky-8
61-
- ubuntu-2004
59+
- ubuntu-2404
6260
agents:
6361
provider: gcp
6462
image: family/elasticsearch-{{matrix.image}}
@@ -74,7 +72,7 @@ steps:
7472
setup:
7573
image:
7674
- rocky-8
77-
- ubuntu-2004
75+
- ubuntu-2404
7876
agents:
7977
provider: gcp
8078
image: family/elasticsearch-{{matrix.image}}
@@ -90,7 +88,7 @@ steps:
9088
setup:
9189
image:
9290
- rocky-8
93-
- ubuntu-2004
91+
- ubuntu-2404
9492
agents:
9593
provider: gcp
9694
image: family/elasticsearch-{{matrix.image}}
@@ -106,7 +104,7 @@ steps:
106104
setup:
107105
image:
108106
- rocky-8
109-
- ubuntu-2004
107+
- ubuntu-2404
110108
agents:
111109
provider: gcp
112110
image: family/elasticsearch-{{matrix.image}}
@@ -122,7 +120,7 @@ steps:
122120
setup:
123121
image:
124122
- rocky-8
125-
- ubuntu-2004
123+
- ubuntu-2404
126124
agents:
127125
provider: gcp
128126
image: family/elasticsearch-{{matrix.image}}
@@ -138,7 +136,7 @@ steps:
138136
setup:
139137
image:
140138
- rocky-8
141-
- ubuntu-2004
139+
- ubuntu-2404
142140
agents:
143141
provider: gcp
144142
image: family/elasticsearch-{{matrix.image}}
@@ -154,7 +152,7 @@ steps:
154152
setup:
155153
image:
156154
- rocky-8
157-
- ubuntu-2004
155+
- ubuntu-2404
158156
agents:
159157
provider: gcp
160158
image: family/elasticsearch-{{matrix.image}}
@@ -170,7 +168,7 @@ steps:
170168
setup:
171169
image:
172170
- rocky-8
173-
- ubuntu-2004
171+
- ubuntu-2404
174172
agents:
175173
provider: gcp
176174
image: family/elasticsearch-{{matrix.image}}
@@ -186,7 +184,7 @@ steps:
186184
setup:
187185
image:
188186
- rocky-8
189-
- ubuntu-2004
187+
- ubuntu-2404
190188
agents:
191189
provider: gcp
192190
image: family/elasticsearch-{{matrix.image}}
@@ -202,7 +200,7 @@ steps:
202200
setup:
203201
image:
204202
- rocky-8
205-
- ubuntu-2004
203+
- ubuntu-2404
206204
agents:
207205
provider: gcp
208206
image: family/elasticsearch-{{matrix.image}}
@@ -218,7 +216,7 @@ steps:
218216
setup:
219217
image:
220218
- rocky-8
221-
- ubuntu-2004
219+
- ubuntu-2404
222220
agents:
223221
provider: gcp
224222
image: family/elasticsearch-{{matrix.image}}
@@ -234,7 +232,7 @@ steps:
234232
setup:
235233
image:
236234
- rocky-8
237-
- ubuntu-2004
235+
- ubuntu-2404
238236
agents:
239237
provider: gcp
240238
image: family/elasticsearch-{{matrix.image}}
@@ -250,7 +248,7 @@ steps:
250248
setup:
251249
image:
252250
- rocky-8
253-
- ubuntu-2004
251+
- ubuntu-2404
254252
agents:
255253
provider: gcp
256254
image: family/elasticsearch-{{matrix.image}}
@@ -266,7 +264,7 @@ steps:
266264
setup:
267265
image:
268266
- rocky-8
269-
- ubuntu-2004
267+
- ubuntu-2404
270268
agents:
271269
provider: gcp
272270
image: family/elasticsearch-{{matrix.image}}
@@ -282,7 +280,7 @@ steps:
282280
setup:
283281
image:
284282
- rocky-8
285-
- ubuntu-2004
283+
- ubuntu-2404
286284
agents:
287285
provider: gcp
288286
image: family/elasticsearch-{{matrix.image}}
@@ -298,7 +296,7 @@ steps:
298296
setup:
299297
image:
300298
- rocky-8
301-
- ubuntu-2004
299+
- ubuntu-2404
302300
agents:
303301
provider: gcp
304302
image: family/elasticsearch-{{matrix.image}}
@@ -314,7 +312,7 @@ steps:
314312
setup:
315313
image:
316314
- rocky-8
317-
- ubuntu-2004
315+
- ubuntu-2404
318316
agents:
319317
provider: gcp
320318
image: family/elasticsearch-{{matrix.image}}
@@ -330,7 +328,7 @@ steps:
330328
setup:
331329
image:
332330
- rocky-8
333-
- ubuntu-2004
331+
- ubuntu-2404
334332
agents:
335333
provider: gcp
336334
image: family/elasticsearch-{{matrix.image}}
@@ -346,7 +344,7 @@ steps:
346344
setup:
347345
image:
348346
- rocky-8
349-
- ubuntu-2004
347+
- ubuntu-2404
350348
agents:
351349
provider: gcp
352350
image: family/elasticsearch-{{matrix.image}}
@@ -362,7 +360,7 @@ steps:
362360
setup:
363361
image:
364362
- rocky-8
365-
- ubuntu-2004
363+
- ubuntu-2404
366364
agents:
367365
provider: gcp
368366
image: family/elasticsearch-{{matrix.image}}
@@ -378,7 +376,7 @@ steps:
378376
setup:
379377
image:
380378
- rocky-8
381-
- ubuntu-2004
379+
- ubuntu-2404
382380
agents:
383381
provider: gcp
384382
image: family/elasticsearch-{{matrix.image}}
@@ -394,7 +392,7 @@ steps:
394392
setup:
395393
image:
396394
- rocky-8
397-
- ubuntu-2004
395+
- ubuntu-2404
398396
agents:
399397
provider: gcp
400398
image: family/elasticsearch-{{matrix.image}}
@@ -410,7 +408,7 @@ steps:
410408
setup:
411409
image:
412410
- rocky-8
413-
- ubuntu-2004
411+
- ubuntu-2404
414412
agents:
415413
provider: gcp
416414
image: family/elasticsearch-{{matrix.image}}
@@ -426,7 +424,7 @@ steps:
426424
setup:
427425
image:
428426
- rocky-8
429-
- ubuntu-2004
427+
- ubuntu-2404
430428
agents:
431429
provider: gcp
432430
image: family/elasticsearch-{{matrix.image}}
@@ -442,7 +440,7 @@ steps:
442440
setup:
443441
image:
444442
- rocky-8
445-
- ubuntu-2004
443+
- ubuntu-2404
446444
agents:
447445
provider: gcp
448446
image: family/elasticsearch-{{matrix.image}}
@@ -458,7 +456,7 @@ steps:
458456
setup:
459457
image:
460458
- rocky-8
461-
- ubuntu-2004
459+
- ubuntu-2404
462460
agents:
463461
provider: gcp
464462
image: family/elasticsearch-{{matrix.image}}

‎.buildkite/pipelines/periodic-platform-support.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ steps:
1515
- oraclelinux-9
1616
- sles-12
1717
- sles-15
18-
- ubuntu-1804
19-
- ubuntu-2004
2018
- ubuntu-2204
2119
- ubuntu-2404
2220
- rocky-8
@@ -64,7 +62,6 @@ steps:
6462
setup:
6563
image:
6664
- almalinux-8-aarch64
67-
- ubuntu-2004-aarch64
6865
- ubuntu-2404-aarch64
6966
agents:
7067
provider: aws

‎.buildkite/pipelines/periodic.bwc.template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
timeout_in_minutes: 300
44
agents:
55
provider: gcp
6-
image: family/elasticsearch-ubuntu-2004
6+
image: family/elasticsearch-ubuntu-2404
77
machineType: n1-standard-32
88
buildDirectory: /dev/shm/bk
99
preemptible: true

0 commit comments

Comments
 (0)