Skip to content

Commit 7d50dee

Browse files
lcawllcawl
authored
Merge branch 'main' into changelog-config
2 parents b69e0b2 + fa27c5a commit 7d50dee

1,252 files changed

Lines changed: 42828 additions & 17061 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/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.10", "9.1.10", "9.2.4", "9.3.0", "9.4.0"]
68+
BWC_VERSION: ["8.19.11", "9.1.11", "9.2.5", "9.3.0", "9.4.0"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

‎.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.10 / bwc
370-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.10#bwcTest
369+
- label: 8.19.11 / bwc
370+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.11#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.10
379+
BWC_VERSION: 8.19.11
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.10 / bwc
408-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.10#bwcTest
407+
- label: 9.1.11 / bwc
408+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.11#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.10
417+
BWC_VERSION: 9.1.11
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.4 / bwc
427-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.2.4#bwcTest
426+
- label: 9.2.5 / bwc
427+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.2.5#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.4
436+
BWC_VERSION: 9.2.5
437437
retry:
438438
automatic:
439439
- exit_status: "-1"
@@ -557,7 +557,7 @@ steps:
557557
timeout_in_minutes: 300
558558
matrix:
559559
setup:
560-
BWC_VERSION: ["8.19.10", "9.1.10", "9.2.4", "9.3.0", "9.4.0"]
560+
BWC_VERSION: ["8.19.11", "9.1.11", "9.2.5", "9.3.0", "9.4.0"]
561561
agents:
562562
provider: gcp
563563
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -336,8 +336,8 @@ steps:
336336
env:
337337
BWC_VERSION: 8.18.8
338338

339-
- label: "{{matrix.image}} / 8.19.10 / packaging-tests-upgrade"
340-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.10
339+
- label: "{{matrix.image}} / 8.19.11 / packaging-tests-upgrade"
340+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.11
341341
timeout_in_minutes: 300
342342
matrix:
343343
setup:
@@ -350,7 +350,7 @@ steps:
350350
machineType: custom-16-32768
351351
buildDirectory: /dev/shm/bk
352352
env:
353-
BWC_VERSION: 8.19.10
353+
BWC_VERSION: 8.19.11
354354

355355
- label: "{{matrix.image}} / 9.0.8 / packaging-tests-upgrade"
356356
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.8
@@ -368,8 +368,8 @@ steps:
368368
env:
369369
BWC_VERSION: 9.0.8
370370

371-
- label: "{{matrix.image}} / 9.1.10 / packaging-tests-upgrade"
372-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.10
371+
- label: "{{matrix.image}} / 9.1.11 / packaging-tests-upgrade"
372+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.11
373373
timeout_in_minutes: 300
374374
matrix:
375375
setup:
@@ -382,10 +382,10 @@ steps:
382382
machineType: custom-16-32768
383383
buildDirectory: /dev/shm/bk
384384
env:
385-
BWC_VERSION: 9.1.10
385+
BWC_VERSION: 9.1.11
386386

387-
- label: "{{matrix.image}} / 9.2.4 / packaging-tests-upgrade"
388-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.4
387+
- label: "{{matrix.image}} / 9.2.5 / packaging-tests-upgrade"
388+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.5
389389
timeout_in_minutes: 300
390390
matrix:
391391
setup:
@@ -398,7 +398,7 @@ steps:
398398
machineType: custom-16-32768
399399
buildDirectory: /dev/shm/bk
400400
env:
401-
BWC_VERSION: 9.2.4
401+
BWC_VERSION: 9.2.5
402402

403403
- label: "{{matrix.image}} / 9.3.0 / packaging-tests-upgrade"
404404
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.3.0

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

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,73 @@ steps:
121121
allowed: true
122122
permit_on_passed: false
123123
reason: "Retry with smart test selection if desired"
124+
- group: java-fips-140-3-matrix
125+
steps:
126+
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.GRADLE_TASK}} / java-fips-140-3-matrix"
127+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true -Dtests.fips.enabled=true -Dtests.fips.mode=140-3 $$GRADLE_TASK
128+
timeout_in_minutes: 300
129+
matrix:
130+
setup:
131+
ES_RUNTIME_JAVA:
132+
- openjdk21
133+
GRADLE_TASK:
134+
- checkPart1
135+
- checkPart2
136+
- checkPart3
137+
- checkPart4
138+
- checkPart5
139+
- checkPart6
140+
- checkRestCompat
141+
agents:
142+
provider: gcp
143+
image: family/elasticsearch-ubuntu-2404
144+
machineType: n1-standard-32
145+
buildDirectory: /dev/shm/bk
146+
env:
147+
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
148+
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
149+
retry:
150+
automatic:
151+
- exit_status: "-1"
152+
limit: 3
153+
signal_reason: none
154+
- signal_reason: agent_stop
155+
limit: 3
156+
- exit_status: "1"
157+
limit: 1
158+
manual:
159+
allowed: true
160+
permit_on_passed: false
161+
reason: "Retry with smart test selection if desired"
162+
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.BWC_VERSION}} / java-fips-140-3-matrix-bwc"
163+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true -Dtests.fips.enabled=true -Dtests.fips.mode=140-3 v$$BWC_VERSION#bwcTest
164+
timeout_in_minutes: 300
165+
matrix:
166+
setup:
167+
ES_RUNTIME_JAVA:
168+
- openjdk21
169+
BWC_VERSION: $BWC_LIST
170+
agents:
171+
provider: gcp
172+
image: family/elasticsearch-ubuntu-2404
173+
machineType: n1-standard-32
174+
buildDirectory: /dev/shm/bk
175+
env:
176+
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
177+
BWC_VERSION: "{{matrix.BWC_VERSION}}"
178+
retry:
179+
automatic:
180+
- exit_status: "-1"
181+
limit: 3
182+
signal_reason: none
183+
- signal_reason: agent_stop
184+
limit: 3
185+
- exit_status: "1"
186+
limit: 1
187+
manual:
188+
allowed: true
189+
permit_on_passed: false
190+
reason: "Retry with smart test selection if desired"
124191
- group: java-matrix
125192
steps:
126193
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.GRADLE_TASK}} / java-matrix"

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 78 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -415,8 +415,8 @@ steps:
415415
- exit_status: "1"
416416
limit: 1
417417

418-
- label: 8.19.10 / bwc
419-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v8.19.10#bwcTest
418+
- label: 8.19.11 / bwc
419+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v8.19.11#bwcTest
420420
timeout_in_minutes: 300
421421
agents:
422422
provider: gcp
@@ -425,7 +425,7 @@ steps:
425425
buildDirectory: /dev/shm/bk
426426
preemptible: true
427427
env:
428-
BWC_VERSION: 8.19.10
428+
BWC_VERSION: 8.19.11
429429
retry:
430430
automatic:
431431
- exit_status: "-1"
@@ -457,8 +457,8 @@ steps:
457457
- exit_status: "1"
458458
limit: 1
459459

460-
- label: 9.1.10 / bwc
461-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.1.10#bwcTest
460+
- label: 9.1.11 / bwc
461+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.1.11#bwcTest
462462
timeout_in_minutes: 300
463463
agents:
464464
provider: gcp
@@ -467,7 +467,7 @@ steps:
467467
buildDirectory: /dev/shm/bk
468468
preemptible: true
469469
env:
470-
BWC_VERSION: 9.1.10
470+
BWC_VERSION: 9.1.11
471471
retry:
472472
automatic:
473473
- exit_status: "-1"
@@ -478,8 +478,8 @@ steps:
478478
- exit_status: "1"
479479
limit: 1
480480

481-
- label: 9.2.4 / bwc
482-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.2.4#bwcTest
481+
- label: 9.2.5 / bwc
482+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.2.5#bwcTest
483483
timeout_in_minutes: 300
484484
agents:
485485
provider: gcp
@@ -488,7 +488,7 @@ steps:
488488
buildDirectory: /dev/shm/bk
489489
preemptible: true
490490
env:
491-
BWC_VERSION: 9.2.4
491+
BWC_VERSION: 9.2.5
492492
retry:
493493
automatic:
494494
- exit_status: "-1"
@@ -625,7 +625,74 @@ steps:
625625
setup:
626626
ES_RUNTIME_JAVA:
627627
- openjdk21
628-
BWC_VERSION: ["8.19.10", "9.1.10", "9.2.4", "9.3.0", "9.4.0"]
628+
BWC_VERSION: ["8.19.11", "9.1.11", "9.2.5", "9.3.0", "9.4.0"]
629+
agents:
630+
provider: gcp
631+
image: family/elasticsearch-ubuntu-2404
632+
machineType: n1-standard-32
633+
buildDirectory: /dev/shm/bk
634+
env:
635+
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
636+
BWC_VERSION: "{{matrix.BWC_VERSION}}"
637+
retry:
638+
automatic:
639+
- exit_status: "-1"
640+
limit: 3
641+
signal_reason: none
642+
- signal_reason: agent_stop
643+
limit: 3
644+
- exit_status: "1"
645+
limit: 1
646+
manual:
647+
allowed: true
648+
permit_on_passed: false
649+
reason: "Retry with smart test selection if desired"
650+
- group: java-fips-140-3-matrix
651+
steps:
652+
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.GRADLE_TASK}} / java-fips-140-3-matrix"
653+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true -Dtests.fips.enabled=true -Dtests.fips.mode=140-3 $$GRADLE_TASK
654+
timeout_in_minutes: 300
655+
matrix:
656+
setup:
657+
ES_RUNTIME_JAVA:
658+
- openjdk21
659+
GRADLE_TASK:
660+
- checkPart1
661+
- checkPart2
662+
- checkPart3
663+
- checkPart4
664+
- checkPart5
665+
- checkPart6
666+
- checkRestCompat
667+
agents:
668+
provider: gcp
669+
image: family/elasticsearch-ubuntu-2404
670+
machineType: n1-standard-32
671+
buildDirectory: /dev/shm/bk
672+
env:
673+
ES_RUNTIME_JAVA: "{{matrix.ES_RUNTIME_JAVA}}"
674+
GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
675+
retry:
676+
automatic:
677+
- exit_status: "-1"
678+
limit: 3
679+
signal_reason: none
680+
- signal_reason: agent_stop
681+
limit: 3
682+
- exit_status: "1"
683+
limit: 1
684+
manual:
685+
allowed: true
686+
permit_on_passed: false
687+
reason: "Retry with smart test selection if desired"
688+
- label: "{{matrix.ES_RUNTIME_JAVA}} / {{matrix.BWC_VERSION}} / java-fips-140-3-matrix-bwc"
689+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true -Dtests.fips.enabled=true -Dtests.fips.mode=140-3 v$$BWC_VERSION#bwcTest
690+
timeout_in_minutes: 300
691+
matrix:
692+
setup:
693+
ES_RUNTIME_JAVA:
694+
- openjdk21
695+
BWC_VERSION: ["8.19.11", "9.1.11", "9.2.5", "9.3.0", "9.4.0"]
629696
agents:
630697
provider: gcp
631698
image: family/elasticsearch-ubuntu-2404
@@ -682,7 +749,7 @@ steps:
682749
ES_RUNTIME_JAVA:
683750
- openjdk21
684751
- openjdk25
685-
BWC_VERSION: ["8.19.10", "9.1.10", "9.2.4", "9.3.0", "9.4.0"]
752+
BWC_VERSION: ["8.19.11", "9.1.11", "9.2.5", "9.3.0", "9.4.0"]
686753
agents:
687754
provider: gcp
688755
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/pull-request/part-1-fips-140-3.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
config:
22
allow-labels:
3-
- test-fips-140-3
3+
- test-fips
44
steps:
55
- label: part-1-fips-140-3
66
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true -Dtests.fips.mode=140-3 checkPart1

‎.buildkite/pipelines/pull-request/part-2-fips-140-3.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
config:
22
allow-labels:
3-
- test-fips-140-3
3+
- test-fips
44
steps:
55
- label: part-2-fips-140-3
66
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true -Dtests.fips.mode=140-3 checkPart2

‎.buildkite/pipelines/pull-request/part-3-fips-140-3.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
config:
22
allow-labels:
3-
- test-fips-140-3
3+
- test-fips
44
steps:
55
- label: part-3-fips-140-3
66
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true -Dtests.fips.mode=140-3 checkPart3

‎.buildkite/pipelines/pull-request/part-4-fips-140-3.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
config:
22
allow-labels:
3-
- test-fips-140-3
3+
- test-fips
44
steps:
55
- label: part-4-fips-140-3
66
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true -Dtests.fips.mode=140-3 checkPart4

‎.buildkite/pipelines/pull-request/part-5-fips-140-3.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
config:
22
allow-labels:
3-
- test-fips-140-3
3+
- test-fips
44
steps:
55
- label: part-5-fips-140-3
66
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true -Dtests.fips.mode=140-3 checkPart5

0 commit comments

Comments
 (0)