Skip to content

Commit 2d2c3da

Browse files
szybiaszybia
committed
Merge remote-tracking branch 'upstream/main' into reindex-cancel-api
* upstream/main: (25 commits) Add spec for project routing CRUD REST API endpoints (elastic#139634) Implement AllSupportedFIeldsTestCase for TDigest (elastic#139744) Mute elastic#139802 (elastic#139803) fix(logsdb): batch bulk indexing to prevent OOM in challenge tests (elastic#139770) Documentation for semantic_text auto pre-filtering (elastic#139749) Always do bulk scoring for rescoring when possible (elastic#139777) Optimize script sorts that do not require query scores (elastic#139748) Bump versions after 9.1.9 release Update branches.json for 9.1.9 release Bump versions after 9.2.3 release Prune changelogs after 8.19.9 release Bump versions after 8.19.9 release Update branches.json for 8.19.9 release Finalize docs for v9.2.3 release (elastic#139795) ESQL: Added timezone support to date_format and date_parse (elastic#138517) Update branches.json for 9.2.3 release Finalize docs for v9.1.9 release (elastic#139796) Switch inline stats to GA in docs (elastic#139753) Validate license in CPS (elastic#139105) FIPS 140-3 support with BC FIPS 2.0.x (elastic#139319) ...
2 parents f22aa74 + cdebb13 commit 2d2c3da

File tree

141 files changed

+2398
-759
lines changed

Some content is hidden

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

141 files changed

+2398
-759
lines changed

‎.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.9", "9.1.9", "9.2.3", "9.3.0"]
68+
BWC_VERSION: ["8.19.10", "9.1.10", "9.2.4", "9.3.0", "9.4.0"]
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.4.0"]
13+
FWC_VERSION: []
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.9 / bwc
370-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.19.9#bwcTest
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
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.9
379+
BWC_VERSION: 8.19.10
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.9 / bwc
408-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.1.9#bwcTest
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
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.9
417+
BWC_VERSION: 9.1.10
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.3 / bwc
427-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.2.3#bwcTest
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
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.3
436+
BWC_VERSION: 9.2.4
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.9", "9.1.9", "9.2.3", "9.3.0"]
560+
BWC_VERSION: ["8.19.10", "9.1.10", "9.2.4", "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.9 / packaging-tests-upgrade"
340-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.9
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
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.9
353+
BWC_VERSION: 8.19.10
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.9 / packaging-tests-upgrade"
372-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.9
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
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.9
385+
BWC_VERSION: 9.1.10
386386

387-
- label: "{{matrix.image}} / 9.2.3 / packaging-tests-upgrade"
388-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.3
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
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.3
401+
BWC_VERSION: 9.2.4
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.yml‎

Lines changed: 11 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.9 / bwc
419-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v8.19.9#bwcTest
418+
- label: 8.19.10 / bwc
419+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v8.19.10#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.9
428+
BWC_VERSION: 8.19.10
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.9 / bwc
461-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.1.9#bwcTest
460+
- label: 9.1.10 / bwc
461+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.1.10#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.9
470+
BWC_VERSION: 9.1.10
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.3 / bwc
482-
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.2.3#bwcTest
481+
- label: 9.2.4 / bwc
482+
command: .ci/scripts/run-gradle.sh --continue -Dbwc.checkout.align=true v9.2.4#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.3
491+
BWC_VERSION: 9.2.4
492492
retry:
493493
automatic:
494494
- exit_status: "-1"
@@ -625,7 +625,7 @@ steps:
625625
setup:
626626
ES_RUNTIME_JAVA:
627627
- openjdk21
628-
BWC_VERSION: ["8.19.9", "9.1.9", "9.2.3", "9.3.0"]
628+
BWC_VERSION: ["8.19.10", "9.1.10", "9.2.4", "9.3.0", "9.4.0"]
629629
agents:
630630
provider: gcp
631631
image: family/elasticsearch-ubuntu-2404
@@ -682,7 +682,7 @@ steps:
682682
ES_RUNTIME_JAVA:
683683
- openjdk21
684684
- openjdk25
685-
BWC_VERSION: ["8.19.9", "9.1.9", "9.2.3", "9.3.0"]
685+
BWC_VERSION: ["8.19.10", "9.1.10", "9.2.4", "9.3.0", "9.4.0"]
686686
agents:
687687
provider: gcp
688688
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
config:
2+
allow-labels:
3+
- test-fips-140-3
4+
steps:
5+
- label: part-1-fips-140-3
6+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true -Dtests.fips.mode=140-3 checkPart1
7+
timeout_in_minutes: 300
8+
agents:
9+
provider: gcp
10+
image: family/elasticsearch-ubuntu-2404
11+
machineType: custom-32-98304
12+
buildDirectory: /dev/shm/bk

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
config:
2+
allow-labels:
3+
- test-fips-140-3
4+
steps:
5+
- label: part-2-fips-140-3
6+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true -Dtests.fips.mode=140-3 checkPart2
7+
timeout_in_minutes: 300
8+
agents:
9+
provider: gcp
10+
image: family/elasticsearch-ubuntu-2404
11+
machineType: custom-32-98304
12+
buildDirectory: /dev/shm/bk

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
config:
2+
allow-labels:
3+
- test-fips-140-3
4+
steps:
5+
- label: part-3-fips-140-3
6+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true -Dtests.fips.mode=140-3 checkPart3
7+
timeout_in_minutes: 300
8+
agents:
9+
provider: gcp
10+
image: family/elasticsearch-ubuntu-2404
11+
machineType: custom-32-98304
12+
buildDirectory: /dev/shm/bk

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
config:
2+
allow-labels:
3+
- test-fips-140-3
4+
steps:
5+
- label: part-4-fips-140-3
6+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true -Dtests.fips.mode=140-3 checkPart4
7+
timeout_in_minutes: 300
8+
agents:
9+
provider: gcp
10+
image: family/elasticsearch-ubuntu-2404
11+
machineType: n1-standard-32
12+
buildDirectory: /dev/shm/bk

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
config:
2+
allow-labels:
3+
- test-fips-140-3
4+
steps:
5+
- label: part-5-fips-140-3
6+
command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true -Dtests.fips.mode=140-3 checkPart5
7+
timeout_in_minutes: 300
8+
agents:
9+
provider: gcp
10+
image: family/elasticsearch-ubuntu-2404
11+
machineType: custom-32-98304
12+
buildDirectory: /dev/shm/bk

0 commit comments

Comments
 (0)