Skip to content

Commit a61a649

Browse files
authored
Merge branch 'main' into add-gemini-thinking-budget
2 parents 9e42997 + 88c5aa0 commit a61a649

File tree

53 files changed

+155
-105
lines changed

Some content is hidden

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

53 files changed

+155
-105
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.18.6", "8.19.4", "9.0.6", "9.1.3", "9.2.0"]
68+
BWC_VERSION: ["8.18.7", "8.19.4", "9.0.6", "9.1.3", "9.2.0"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

.buildkite/pipelines/periodic-packaging.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@ steps:
318318
env:
319319
BWC_VERSION: 8.17.10
320320

321-
- label: "{{matrix.image}} / 8.18.6 / packaging-tests-upgrade"
322-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.6
321+
- label: "{{matrix.image}} / 8.18.7 / packaging-tests-upgrade"
322+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.7
323323
timeout_in_minutes: 300
324324
matrix:
325325
setup:
@@ -332,7 +332,7 @@ steps:
332332
machineType: custom-16-32768
333333
buildDirectory: /dev/shm/bk
334334
env:
335-
BWC_VERSION: 8.18.6
335+
BWC_VERSION: 8.18.7
336336

337337
- label: "{{matrix.image}} / 8.19.4 / packaging-tests-upgrade"
338338
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.4

.buildkite/pipelines/periodic.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ steps:
344344
- signal_reason: agent_stop
345345
limit: 3
346346

347-
- label: 8.18.6 / bwc
348-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.6#bwcTest
347+
- label: 8.18.7 / bwc
348+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.7#bwcTest
349349
timeout_in_minutes: 300
350350
agents:
351351
provider: gcp
@@ -354,7 +354,7 @@ steps:
354354
buildDirectory: /dev/shm/bk
355355
preemptible: true
356356
env:
357-
BWC_VERSION: 8.18.6
357+
BWC_VERSION: 8.18.7
358358
retry:
359359
automatic:
360360
- exit_status: "-1"
@@ -506,7 +506,7 @@ steps:
506506
setup:
507507
ES_RUNTIME_JAVA:
508508
- openjdk21
509-
BWC_VERSION: ["8.18.6", "8.19.4", "9.0.6", "9.1.3", "9.2.0"]
509+
BWC_VERSION: ["8.18.7", "8.19.4", "9.0.6", "9.1.3", "9.2.0"]
510510
agents:
511511
provider: gcp
512512
image: family/elasticsearch-ubuntu-2404
@@ -550,7 +550,7 @@ steps:
550550
ES_RUNTIME_JAVA:
551551
- openjdk21
552552
- openjdk23
553-
BWC_VERSION: ["8.18.6", "8.19.4", "9.0.6", "9.1.3", "9.2.0"]
553+
BWC_VERSION: ["8.18.7", "8.19.4", "9.0.6", "9.1.3", "9.2.0"]
554554
agents:
555555
provider: gcp
556556
image: family/elasticsearch-ubuntu-2404

.ci/bwcVersions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ BWC_VERSION:
1717
- "8.15.5"
1818
- "8.16.6"
1919
- "8.17.10"
20-
- "8.18.6"
20+
- "8.18.7"
2121
- "8.19.4"
2222
- "9.0.6"
2323
- "9.1.3"

.ci/snapshotBwcVersions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BWC_VERSION:
2-
- "8.18.6"
2+
- "8.18.7"
33
- "8.19.4"
44
- "9.0.6"
55
- "9.1.3"

docs/changelog/130336.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/changelog/132638.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/changelog/132646.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/changelog/132766.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.

muted-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,9 @@ tests:
636636
- class: org.elasticsearch.compute.data.BasicBlockTests
637637
method: testFloatBlock
638638
issue: https://github.com/elastic/elasticsearch/issues/133621
639+
- class: org.elasticsearch.xpack.esql.qa.mixed.MixedClusterEsqlSpecIT
640+
method: test {csv-spec:inlinestats.EvalBeforeDoubleInlinestats1}
641+
issue: https://github.com/elastic/elasticsearch/issues/133729
639642

640643
# Examples:
641644
#

0 commit comments

Comments
 (0)