Skip to content

Commit 2ec4e68

Browse files
drempapisdrempapis
authored
Merge branch 'main' into test-failure/RcsCcsCommonYamlTestSuiteIT_suite_timeout
2 parents ff22888 + d86f2a8 commit 2ec4e68

File tree

11 files changed

+31
-26
lines changed

11 files changed

+31
-26
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", "8.19.2", "9.0.5", "9.1.2", "9.2.0"]
68+
BWC_VERSION: ["8.17.10", "8.18.6", "8.19.2", "9.0.6", "9.1.2", "9.2.0"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

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

Lines changed: 6 additions & 6 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.5 / packaging-tests-upgrade"
322-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.5
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
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.5
335+
BWC_VERSION: 8.18.6
336336

337337
- label: "{{matrix.image}} / 8.19.2 / packaging-tests-upgrade"
338338
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.2
@@ -350,8 +350,8 @@ steps:
350350
env:
351351
BWC_VERSION: 8.19.2
352352

353-
- label: "{{matrix.image}} / 9.0.5 / packaging-tests-upgrade"
354-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.5
353+
- label: "{{matrix.image}} / 9.0.6 / packaging-tests-upgrade"
354+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.6
355355
timeout_in_minutes: 300
356356
matrix:
357357
setup:
@@ -364,7 +364,7 @@ steps:
364364
machineType: custom-16-32768
365365
buildDirectory: /dev/shm/bk
366366
env:
367-
BWC_VERSION: 9.0.5
367+
BWC_VERSION: 9.0.6
368368

369369
- label: "{{matrix.image}} / 9.1.2 / packaging-tests-upgrade"
370370
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.2

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 8 additions & 8 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.5 / bwc
348-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.5#bwcTest
347+
- label: 8.18.6 / bwc
348+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.6#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.5
357+
BWC_VERSION: 8.18.6
358358
retry:
359359
automatic:
360360
- exit_status: "-1"
@@ -382,8 +382,8 @@ steps:
382382
- signal_reason: agent_stop
383383
limit: 3
384384

385-
- label: 9.0.5 / bwc
386-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.5#bwcTest
385+
- label: 9.0.6 / bwc
386+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.6#bwcTest
387387
timeout_in_minutes: 300
388388
agents:
389389
provider: gcp
@@ -392,7 +392,7 @@ steps:
392392
buildDirectory: /dev/shm/bk
393393
preemptible: true
394394
env:
395-
BWC_VERSION: 9.0.5
395+
BWC_VERSION: 9.0.6
396396
retry:
397397
automatic:
398398
- exit_status: "-1"
@@ -506,7 +506,7 @@ steps:
506506
setup:
507507
ES_RUNTIME_JAVA:
508508
- openjdk21
509-
BWC_VERSION: ["8.17.10", "8.18.5", "8.19.2", "9.0.5", "9.1.2", "9.2.0"]
509+
BWC_VERSION: ["8.17.10", "8.18.6", "8.19.2", "9.0.6", "9.1.2", "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.17.10", "8.18.5", "8.19.2", "9.0.5", "9.1.2", "9.2.0"]
553+
BWC_VERSION: ["8.17.10", "8.18.6", "8.19.2", "9.0.6", "9.1.2", "9.2.0"]
554554
agents:
555555
provider: gcp
556556
image: family/elasticsearch-ubuntu-2404

‎.ci/bwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ BWC_VERSION:
1717
- "8.15.5"
1818
- "8.16.6"
1919
- "8.17.10"
20-
- "8.18.5"
20+
- "8.18.6"
2121
- "8.19.2"
22-
- "9.0.5"
22+
- "9.0.6"
2323
- "9.1.2"
2424
- "9.2.0"

‎.ci/snapshotBwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
BWC_VERSION:
22
- "8.17.10"
3-
- "8.18.5"
3+
- "8.18.6"
44
- "8.19.2"
5-
- "9.0.5"
5+
- "9.0.6"
66
- "9.1.2"
77
- "9.2.0"

‎docs/changelog/132320.yaml‎

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

‎muted-tests.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,9 @@ tests:
503503
- class: org.elasticsearch.test.rest.ClientYamlTestSuiteIT
504504
method: test {yaml=indices.simulate_index_template/10_basic/Simulate index template with data stream with mapping and setting overrides}
505505
issue: https://github.com/elastic/elasticsearch/issues/132702
506+
- class: org.elasticsearch.xpack.ml.integration.RevertModelSnapshotIT
507+
method: testRevertModelSnapshot
508+
issue: https://github.com/elastic/elasticsearch/issues/132733
506509

507510
# Examples:
508511
#

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ static TransportVersion def(int id) {
149149
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_3 = def(8_840_0_05);
150150
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_4 = def(8_840_0_06);
151151
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_5 = def(8_840_0_07);
152+
public static final TransportVersion INITIAL_ELASTICSEARCH_8_18_6 = def(8_840_0_08);
152153
public static final TransportVersion INITIAL_ELASTICSEARCH_8_19 = def(8_841_0_00);
153154
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED_BACKPORT_8_X = def(8_841_0_01);
154155
public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_19 = def(8_841_0_02);
@@ -220,6 +221,7 @@ static TransportVersion def(int id) {
220221
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_3 = def(9_000_0_12);
221222
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_4 = def(9_000_0_13);
222223
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_5 = def(9_000_0_14);
224+
public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_6 = def(9_000_0_15);
223225
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_001_0_00);
224226
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES = def(9_002_0_00);
225227
public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED = def(9_003_0_00);
@@ -426,7 +428,7 @@ static TransportVersion def(int id) {
426428
* Reference to the minimum transport version that can be used with CCS.
427429
* This should be the transport version used by the previous minor release.
428430
*/
429-
public static final TransportVersion MINIMUM_CCS_VERSION = INITIAL_ELASTICSEARCH_9_1_1;
431+
public static final TransportVersion MINIMUM_CCS_VERSION = INITIAL_ELASTICSEARCH_9_0_5;
430432

431433
/**
432434
* Sorted list of all versions defined in this class

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

Lines changed: 2 additions & 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_18_6 = new Version(8_18_06_99);
215216
public static final Version V_8_19_0 = new Version(8_19_00_99);
216217
public static final Version V_8_19_1 = new Version(8_19_01_99);
217218
public static final Version V_8_19_2 = new Version(8_19_02_99);
@@ -221,6 +222,7 @@ public class Version implements VersionId<Version>, ToXContentFragment {
221222
public static final Version V_9_0_3 = new Version(9_00_03_99);
222223
public static final Version V_9_0_4 = new Version(9_00_04_99);
223224
public static final Version V_9_0_5 = new Version(9_00_05_99);
225+
public static final Version V_9_0_6 = new Version(9_00_06_99);
224226
public static final Version V_9_1_0 = new Version(9_01_00_99);
225227
public static final Version V_9_1_1 = new Version(9_01_01_99);
226228
public static final Version V_9_1_2 = new Version(9_01_02_99);

‎server/src/main/resources/org/elasticsearch/TransportVersions.csv‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,14 @@
155155
8.18.2,8840004
156156
8.18.3,8840005
157157
8.18.4,8840006
158+
8.18.5,8840007
158159
8.19.0,8841064
159160
8.19.1,8841065
160161
9.0.0,9000009
161162
9.0.1,9000010
162163
9.0.2,9000011
163164
9.0.3,9000012
164165
9.0.4,9000013
166+
9.0.5,9000014
165167
9.1.0,9112003
166168
9.1.1,9112004

0 commit comments

Comments
 (0)