Merge branch 'main' into refactor-xpack-deprecation-tests

Author: ldematte

.buildkite/pipelines/intake.yml

@@ -65,7 +65,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["8.17.10", "8.18.6", "8.19.2", "9.0.5", "9.1.2", "9.2.0"]
+            BWC_VERSION: ["8.17.10", "8.18.6", "8.19.2", "9.0.6", "9.1.2", "9.2.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2404

.buildkite/pipelines/periodic-packaging.yml

@@ -350,8 +350,8 @@ steps:
         env:
           BWC_VERSION: 8.19.2
 
-      - label: "{{matrix.image}} / 9.0.5 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.5
+      - label: "{{matrix.image}} / 9.0.6 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.6
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -364,7 +364,7 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 9.0.5
+          BWC_VERSION: 9.0.6
 
       - label: "{{matrix.image}} / 9.1.2 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.2

.buildkite/pipelines/periodic.yml

@@ -382,8 +382,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 9.0.5 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.5#bwcTest
+      - label: 9.0.6 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.6#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -392,7 +392,7 @@ steps:
           buildDirectory: /dev/shm/bk
           preemptible: true
         env:
-          BWC_VERSION: 9.0.5
+          BWC_VERSION: 9.0.6
         retry:
           automatic:
             - exit_status: "-1"
@@ -506,7 +506,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk21
-            BWC_VERSION: ["8.17.10", "8.18.6", "8.19.2", "9.0.5", "9.1.2", "9.2.0"]
+            BWC_VERSION: ["8.17.10", "8.18.6", "8.19.2", "9.0.6", "9.1.2", "9.2.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2404
@@ -550,7 +550,7 @@ steps:
             ES_RUNTIME_JAVA:
               - openjdk21
               - openjdk23
-            BWC_VERSION: ["8.17.10", "8.18.6", "8.19.2", "9.0.5", "9.1.2", "9.2.0"]
+            BWC_VERSION: ["8.17.10", "8.18.6", "8.19.2", "9.0.6", "9.1.2", "9.2.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2404

.ci/bwcVersions

@@ -19,6 +19,6 @@ BWC_VERSION:
   - "8.17.10"
   - "8.18.6"
   - "8.19.2"
-  - "9.0.5"
+  - "9.0.6"
   - "9.1.2"
   - "9.2.0"

.ci/snapshotBwcVersions

@@ -2,6 +2,6 @@ BWC_VERSION:
   - "8.17.10"
   - "8.18.6"
   - "8.19.2"
-  - "9.0.5"
+  - "9.0.6"
   - "9.1.2"
   - "9.2.0"

muted-tests.yml

@@ -518,6 +518,9 @@ tests:
 - class: org.elasticsearch.test.rest.ClientYamlTestSuiteIT
   method: test {yaml=indices.simulate_index_template/10_basic/Simulate index template with data stream with mapping and setting overrides}
   issue: https://github.com/elastic/elasticsearch/issues/132702
+- class: org.elasticsearch.xpack.ml.integration.RevertModelSnapshotIT
+  method: testRevertModelSnapshot
+  issue: https://github.com/elastic/elasticsearch/issues/132733
 
 # Examples:
 #

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

@@ -221,6 +221,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_3 = def(9_000_0_12);
     public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_4 = def(9_000_0_13);
     public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_5 = def(9_000_0_14);
+    public static final TransportVersion INITIAL_ELASTICSEARCH_9_0_6 = def(9_000_0_15);
     public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_001_0_00);
     public static final TransportVersion REMOVE_SNAPSHOT_FAILURES = def(9_002_0_00);
     public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED = def(9_003_0_00);
@@ -427,7 +428,7 @@ static TransportVersion def(int id) {
      * Reference to the minimum transport version that can be used with CCS.
      * This should be the transport version used by the previous minor release.
      */
-    public static final TransportVersion MINIMUM_CCS_VERSION = INITIAL_ELASTICSEARCH_9_1_1;
+    public static final TransportVersion MINIMUM_CCS_VERSION = INITIAL_ELASTICSEARCH_9_0_5;
 
     /**
      * Sorted list of all versions defined in this class

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

@@ -222,6 +222,7 @@ public class Version implements VersionId<Version>, ToXContentFragment {
     public static final Version V_9_0_3 = new Version(9_00_03_99);
     public static final Version V_9_0_4 = new Version(9_00_04_99);
     public static final Version V_9_0_5 = new Version(9_00_05_99);
+    public static final Version V_9_0_6 = new Version(9_00_06_99);
     public static final Version V_9_1_0 = new Version(9_01_00_99);
     public static final Version V_9_1_1 = new Version(9_01_01_99);
     public static final Version V_9_1_2 = new Version(9_01_02_99);

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

@@ -163,5 +163,6 @@
 9.0.2,9000011
 9.0.3,9000012
 9.0.4,9000013
+9.0.5,9000014
 9.1.0,9112003
 9.1.1,9112004

server/src/main/resources/org/elasticsearch/index/IndexVersions.csv

@@ -163,5 +163,6 @@
 9.0.2,9009000
 9.0.3,9009000
 9.0.4,9009000
+9.0.5,9009000
 9.1.0,9033000
 9.1.1,9033000