Skip to content

Commit 492c3f4

Browse files
davidkyledavidkyle
authored
Merge branch '9.2' into backport/9.2/pr-137456
2 parents a13fcf3 + 2a77df3 commit 492c3f4

File tree

455 files changed

+8249
-2275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

455 files changed

+8249
-2275
lines changed

‎.backportrc.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"targetBranchChoices" : [ "main", "9.2", "9.1", "9.0", "8.19", "8.18", "8.17", "8.16", "8.15", "8.14", "8.13", "8.12", "8.11", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
44
"targetPRLabels" : [ "backport" ],
55
"branchLabelMapping" : {
6-
"^v9.2.1$" : "main",
6+
"^v9.2.2$" : "main",
77
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
88
}
99
}

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ steps:
6565
timeout_in_minutes: 300
6666
matrix:
6767
setup:
68-
BWC_VERSION: ["8.19.7", "9.1.7", "9.2.1"]
68+
BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/periodic-fwc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ steps:
1010
buildDirectory: /dev/shm/bk
1111
matrix:
1212
setup:
13-
FWC_VERSION: ["9.2.0"]
13+
FWC_VERSION: ["9.2.0", "9.2.1"]
1414
env:
1515
FWC_VERSION: "{{matrix.FWC_VERSION}}"

‎.buildkite/pipelines/periodic-java-ea.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -366,8 +366,8 @@ steps:
366366
- signal_reason: agent_stop
367367
limit: 3
368368

369-
- label: 8.19.7 / bwc
370-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.7#bwcTest
369+
- label: 8.19.8 / bwc
370+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.8#bwcTest
371371
timeout_in_minutes: 300
372372
agents:
373373
provider: gcp
@@ -376,7 +376,7 @@ steps:
376376
buildDirectory: /dev/shm/bk
377377
preemptible: true
378378
env:
379-
BWC_VERSION: 8.19.7
379+
BWC_VERSION: 8.19.8
380380
retry:
381381
automatic:
382382
- exit_status: "-1"
@@ -404,8 +404,8 @@ steps:
404404
- signal_reason: agent_stop
405405
limit: 3
406406

407-
- label: 9.1.7 / bwc
408-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.7#bwcTest
407+
- label: 9.1.8 / bwc
408+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.8#bwcTest
409409
timeout_in_minutes: 300
410410
agents:
411411
provider: gcp
@@ -414,7 +414,7 @@ steps:
414414
buildDirectory: /dev/shm/bk
415415
preemptible: true
416416
env:
417-
BWC_VERSION: 9.1.7
417+
BWC_VERSION: 9.1.8
418418
retry:
419419
automatic:
420420
- exit_status: "-1"
@@ -423,8 +423,8 @@ steps:
423423
- signal_reason: agent_stop
424424
limit: 3
425425

426-
- label: 9.2.1 / bwc
427-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.2.1#bwcTest
426+
- label: 9.2.2 / bwc
427+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.2.2#bwcTest
428428
timeout_in_minutes: 300
429429
agents:
430430
provider: gcp
@@ -433,7 +433,7 @@ steps:
433433
buildDirectory: /dev/shm/bk
434434
preemptible: true
435435
env:
436-
BWC_VERSION: 9.2.1
436+
BWC_VERSION: 9.2.2
437437
retry:
438438
automatic:
439439
- exit_status: "-1"
@@ -519,7 +519,7 @@ steps:
519519
timeout_in_minutes: 300
520520
matrix:
521521
setup:
522-
BWC_VERSION: ["8.19.7", "9.1.7", "9.2.1"]
522+
BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2"]
523523
agents:
524524
provider: gcp
525525
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ steps:
88
setup:
99
image:
1010
- debian-12
11+
- debian-13
1112
- opensuse-leap-15
1213
- oraclelinux-8
1314
- oraclelinux-9

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ steps:
99
setup:
1010
image:
1111
- debian-12
12+
- debian-13
1213
- opensuse-leap-15
1314
- oraclelinux-8
1415
- oraclelinux-9
@@ -334,8 +335,8 @@ steps:
334335
env:
335336
BWC_VERSION: 8.18.8
336337

337-
- label: "{{matrix.image}} / 8.19.7 / packaging-tests-upgrade"
338-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.7
338+
- label: "{{matrix.image}} / 8.19.8 / packaging-tests-upgrade"
339+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.8
339340
timeout_in_minutes: 300
340341
matrix:
341342
setup:
@@ -348,7 +349,7 @@ steps:
348349
machineType: custom-16-32768
349350
buildDirectory: /dev/shm/bk
350351
env:
351-
BWC_VERSION: 8.19.7
352+
BWC_VERSION: 8.19.8
352353

353354
- label: "{{matrix.image}} / 9.0.7 / packaging-tests-upgrade"
354355
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.7
@@ -366,8 +367,8 @@ steps:
366367
env:
367368
BWC_VERSION: 9.0.7
368369

369-
- label: "{{matrix.image}} / 9.1.7 / packaging-tests-upgrade"
370-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.7
370+
- label: "{{matrix.image}} / 9.1.8 / packaging-tests-upgrade"
371+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.8
371372
timeout_in_minutes: 300
372373
matrix:
373374
setup:
@@ -380,10 +381,10 @@ steps:
380381
machineType: custom-16-32768
381382
buildDirectory: /dev/shm/bk
382383
env:
383-
BWC_VERSION: 9.1.7
384+
BWC_VERSION: 9.1.8
384385

385-
- label: "{{matrix.image}} / 9.2.1 / packaging-tests-upgrade"
386-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.1
386+
- label: "{{matrix.image}} / 9.2.2 / packaging-tests-upgrade"
387+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.2
387388
timeout_in_minutes: 300
388389
matrix:
389390
setup:
@@ -396,7 +397,7 @@ steps:
396397
machineType: custom-16-32768
397398
buildDirectory: /dev/shm/bk
398399
env:
399-
BWC_VERSION: 9.2.1
400+
BWC_VERSION: 9.2.2
400401

401402
- group: packaging-tests-windows
402403
steps:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ steps:
88
setup:
99
image:
1010
- debian-12
11+
- debian-13
1112
- opensuse-leap-15
1213
- oraclelinux-8
1314
- oraclelinux-9

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,8 @@ steps:
363363
- signal_reason: agent_stop
364364
limit: 3
365365

366-
- label: 8.19.7 / bwc
367-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v8.19.7#bwcTest
366+
- label: 8.19.8 / bwc
367+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v8.19.8#bwcTest
368368
timeout_in_minutes: 300
369369
agents:
370370
provider: gcp
@@ -373,7 +373,7 @@ steps:
373373
buildDirectory: /dev/shm/bk
374374
preemptible: true
375375
env:
376-
BWC_VERSION: 8.19.7
376+
BWC_VERSION: 8.19.8
377377
retry:
378378
automatic:
379379
- exit_status: "-1"
@@ -401,8 +401,8 @@ steps:
401401
- signal_reason: agent_stop
402402
limit: 3
403403

404-
- label: 9.1.7 / bwc
405-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.1.7#bwcTest
404+
- label: 9.1.8 / bwc
405+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.1.8#bwcTest
406406
timeout_in_minutes: 300
407407
agents:
408408
provider: gcp
@@ -411,7 +411,7 @@ steps:
411411
buildDirectory: /dev/shm/bk
412412
preemptible: true
413413
env:
414-
BWC_VERSION: 9.1.7
414+
BWC_VERSION: 9.1.8
415415
retry:
416416
automatic:
417417
- exit_status: "-1"
@@ -420,8 +420,8 @@ steps:
420420
- signal_reason: agent_stop
421421
limit: 3
422422

423-
- label: 9.2.1 / bwc
424-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.2.1#bwcTest
423+
- label: 9.2.2 / bwc
424+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.2.2#bwcTest
425425
timeout_in_minutes: 300
426426
agents:
427427
provider: gcp
@@ -430,7 +430,7 @@ steps:
430430
buildDirectory: /dev/shm/bk
431431
preemptible: true
432432
env:
433-
BWC_VERSION: 9.2.1
433+
BWC_VERSION: 9.2.2
434434
retry:
435435
automatic:
436436
- exit_status: "-1"
@@ -511,7 +511,7 @@ steps:
511511
setup:
512512
ES_RUNTIME_JAVA:
513513
- openjdk21
514-
BWC_VERSION: ["8.19.7", "9.1.7", "9.2.1"]
514+
BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2"]
515515
agents:
516516
provider: gcp
517517
image: family/elasticsearch-ubuntu-2404
@@ -557,7 +557,7 @@ steps:
557557
ES_RUNTIME_JAVA:
558558
- openjdk21
559559
- openjdk23
560-
BWC_VERSION: ["8.19.7", "9.1.7", "9.2.1"]
560+
BWC_VERSION: ["8.19.8", "9.1.8", "9.2.2"]
561561
agents:
562562
provider: gcp
563563
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/pull-request/packaging-tests-unix.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ steps:
1111
setup:
1212
image:
1313
- debian-12
14+
- debian-13
1415
- opensuse-leap-15
1516
- oraclelinux-8
1617
- oraclelinux-9

‎.ci/bwcVersions‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ BWC_VERSION:
1818
- "8.16.6"
1919
- "8.17.10"
2020
- "8.18.8"
21-
- "8.19.7"
21+
- "8.19.8"
2222
- "9.0.7"
23-
- "9.1.7"
24-
- "9.2.1"
23+
- "9.1.8"
24+
- "9.2.2"

0 commit comments

Comments
 (0)