Skip to content

Commit d527044

Browse files
Merge branch 'main' into datetrunc-roundto-with-min-max-from-predicates-2
2 parents ccc30aa + 198148c commit d527044

File tree

15 files changed

+298
-153
lines changed

15 files changed

+298
-153
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.17.10", "8.18.5", "9.0.5", "9.1.1", "9.2.0"]
68+
BWC_VERSION: ["8.17.10", "8.18.5", "8.19.0", "9.0.5", "9.1.1", "9.2.0"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

.buildkite/pipelines/periodic-packaging.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,22 @@ steps:
334334
env:
335335
BWC_VERSION: 8.18.5
336336

337+
- label: "{{matrix.image}} / 8.19.0 / packaging-tests-upgrade"
338+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.0
339+
timeout_in_minutes: 300
340+
matrix:
341+
setup:
342+
image:
343+
- rocky-8
344+
- ubuntu-2404
345+
agents:
346+
provider: gcp
347+
image: family/elasticsearch-{{matrix.image}}
348+
machineType: custom-16-32768
349+
buildDirectory: /dev/shm/bk
350+
env:
351+
BWC_VERSION: 8.19.0
352+
337353
- label: "{{matrix.image}} / 9.0.5 / packaging-tests-upgrade"
338354
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.5
339355
timeout_in_minutes: 300

.buildkite/pipelines/periodic.yml

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

366+
- label: 8.19.0 / bwc
367+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.19.0#bwcTest
368+
timeout_in_minutes: 300
369+
agents:
370+
provider: gcp
371+
image: family/elasticsearch-ubuntu-2404
372+
machineType: n1-standard-32
373+
buildDirectory: /dev/shm/bk
374+
preemptible: true
375+
env:
376+
BWC_VERSION: 8.19.0
377+
retry:
378+
automatic:
379+
- exit_status: "-1"
380+
limit: 3
381+
signal_reason: none
382+
- signal_reason: agent_stop
383+
limit: 3
384+
366385
- label: 9.0.5 / bwc
367386
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.5#bwcTest
368387
timeout_in_minutes: 300
@@ -487,7 +506,7 @@ steps:
487506
setup:
488507
ES_RUNTIME_JAVA:
489508
- openjdk21
490-
BWC_VERSION: ["8.17.10", "8.18.5", "9.0.5", "9.1.1", "9.2.0"]
509+
BWC_VERSION: ["8.17.10", "8.18.5", "8.19.0", "9.0.5", "9.1.1", "9.2.0"]
491510
agents:
492511
provider: gcp
493512
image: family/elasticsearch-ubuntu-2404
@@ -531,7 +550,7 @@ steps:
531550
ES_RUNTIME_JAVA:
532551
- openjdk21
533552
- openjdk23
534-
BWC_VERSION: ["8.17.10", "8.18.5", "9.0.5", "9.1.1", "9.2.0"]
553+
BWC_VERSION: ["8.17.10", "8.18.5", "8.19.0", "9.0.5", "9.1.1", "9.2.0"]
535554
agents:
536555
provider: gcp
537556
image: family/elasticsearch-ubuntu-2404

.ci/bwcVersions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ BWC_VERSION:
1818
- "8.16.6"
1919
- "8.17.10"
2020
- "8.18.5"
21+
- "8.19.0"
2122
- "9.0.5"
2223
- "9.1.1"
2324
- "9.2.0"

.ci/snapshotBwcVersions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
BWC_VERSION:
22
- "8.17.10"
33
- "8.18.5"
4+
- "8.19.0"
45
- "9.0.5"
56
- "9.1.1"
67
- "9.2.0"

muted-tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -596,6 +596,9 @@ tests:
596596
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
597597
method: testDenseVectorMappingUpdate {initialType=int4_flat updateType=int4_hnsw}
598598
issue: https://github.com/elastic/elasticsearch/issues/132140
599+
- class: org.elasticsearch.index.mapper.vectors.DenseVectorFieldIndexTypeUpdateIT
600+
method: testDenseVectorMappingUpdate {initialType=int8_flat updateType=bbq_hnsw}
601+
issue: https://github.com/elastic/elasticsearch/issues/132141
599602

600603
# Examples:
601604
#

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,6 @@ static TransportVersion def(int id) {
333333
public static final TransportVersion ESQL_SPLIT_ON_BIG_VALUES_9_1 = def(9_112_0_01);
334334
public static final TransportVersion ESQL_FIXED_INDEX_LIKE_9_1 = def(9_112_0_02);
335335
public static final TransportVersion ESQL_SAMPLE_OPERATOR_STATUS_9_1 = def(9_112_0_03);
336-
// Below is the first version in 9.2 and NOT in 9.1.
337336
public static final TransportVersion INITIAL_ELASTICSEARCH_9_1_1 = def(9_112_0_04);
338337
public static final TransportVersion PROJECT_STATE_REGISTRY_RECORDS_DELETIONS = def(9_113_0_00);
339338
public static final TransportVersion ESQL_SERIALIZE_TIMESERIES_FIELD_TYPE = def(9_114_0_00);

server/src/main/java/org/elasticsearch/Version.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ public class Version implements VersionId<Version>, ToXContentFragment {
212212
public static final Version V_8_18_3 = new Version(8_18_03_99);
213213
public static final Version V_8_18_4 = new Version(8_18_04_99);
214214
public static final Version V_8_18_5 = new Version(8_18_05_99);
215+
public static final Version V_8_19_0 = new Version(8_19_00_99);
215216
public static final Version V_9_0_0 = new Version(9_00_00_99);
216217
public static final Version V_9_0_1 = new Version(9_00_01_99);
217218
public static final Version V_9_0_2 = new Version(9_00_02_99);

x-pack/plugin/slm/src/main/java/org/elasticsearch/xpack/slm/SnapshotLifecycle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public Collection<?> createComponents(PluginServices services) {
134134
snapshotLifecycleService.set(
135135
new SnapshotLifecycleService(
136136
settings,
137-
() -> new SnapshotLifecycleTask(client, clusterService, snapshotHistoryStore.get()),
137+
projectId -> new SnapshotLifecycleTask(projectId, client, clusterService, snapshotHistoryStore.get()),
138138
clusterService,
139139
getClock()
140140
)

0 commit comments

Comments
 (0)