Bump versions after 8.10.3 release

elastic · Oct 10, 2023 · 1465601 · 1465601
1 parent b216d95
commit 1465601
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 6 deletions.
diff --git a/.backportrc.json b/.backportrc.json
@@ -3,7 +3,7 @@
   "targetBranchChoices" : [ "main", "8.10", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
   "targetPRLabels" : [ "backport" ],
   "branchLabelMapping" : {
-    "^v8.10.3$" : "main",
+    "^v8.10.4$" : "main",
     "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
   }
 }
diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml
@@ -40,7 +40,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["7.17.15", "8.10.3"]
+            BWC_VERSION: ["7.17.15", "8.10.4"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml
@@ -1664,6 +1664,22 @@ steps:
         env:
           BWC_VERSION: 8.10.3
 
+      - label: "{{matrix.image}} / 8.10.4 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.10.4
+        timeout_in_minutes: 300
+        matrix:
+          setup:
+            image:
+              - rocky-8
+              - ubuntu-2004
+        agents:
+          provider: gcp
+          image: family/elasticsearch-{{matrix.image}}
+          machineType: custom-16-32768
+          buildDirectory: /dev/shm/bk
+        env:
+          BWC_VERSION: 8.10.4
+
   - group: packaging-tests-windows
     steps:
       - label: "{{matrix.image}} / packaging-tests-windows"

diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml
@@ -1022,6 +1022,16 @@ steps:
           buildDirectory: /dev/shm/bk
         env:
           BWC_VERSION: 8.10.3
+      - label: 8.10.4 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.10.4#bwcTest
+        timeout_in_minutes: 300
+        agents:
+          provider: gcp
+          image: family/elasticsearch-ubuntu-2004
+          machineType: custom-32-98304
+          buildDirectory: /dev/shm/bk
+        env:
+          BWC_VERSION: 8.10.4
   - label: concurrent-search-tests
     command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true check
     timeout_in_minutes: 420

diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -101,3 +101,4 @@ BWC_VERSION:
   - "8.10.1"
   - "8.10.2"
   - "8.10.3"
+  - "8.10.4"
diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions
@@ -1,3 +1,3 @@
 BWC_VERSION:
   - "7.17.15"
-  - "8.10.3"
+  - "8.10.4"
diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties
@@ -1,4 +1,4 @@
-elasticsearch     = 8.10.3
+elasticsearch     = 8.10.4
 lucene            = 9.7.0
 
 bundled_jdk_vendor = openjdk

diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java
@@ -154,7 +154,8 @@ public class Version implements VersionId<Version>, ToXContentFragment {
     public static final Version V_8_10_1 = new Version(8_10_01_99, IndexVersion.V_8_10_1);
     public static final Version V_8_10_2 = new Version(8_10_02_99, IndexVersion.V_8_10_2);
     public static final Version V_8_10_3 = new Version(8_10_03_99, IndexVersion.V_8_10_3);
-    public static final Version CURRENT = V_8_10_3;
+    public static final Version V_8_10_4 = new Version(8_10_04_99, IndexVersion.V_8_10_4);
+    public static final Version CURRENT = V_8_10_4;
 
     private static final NavigableMap<Integer, Version> VERSION_IDS;
     private static final Map<String, Version> VERSION_STRINGS;

diff --git a/server/src/main/java/org/elasticsearch/index/IndexVersion.java b/server/src/main/java/org/elasticsearch/index/IndexVersion.java
@@ -185,12 +185,13 @@ private static IndexVersion registerIndexVersion(int id, Version luceneVersion,
     public static final IndexVersion V_8_10_1 = registerIndexVersion(8_10_01_99, Version.LUCENE_9_7_0, "5f4ccc3d-3769-4aef-819d-945c47b9a08b");
     public static final IndexVersion V_8_10_2 = registerIndexVersion(8_10_02_99, Version.LUCENE_9_7_0, "afcbbc72-deae-4bb8-82ff-48a5c7eea074");
     public static final IndexVersion V_8_10_3 = registerIndexVersion(8_10_03_99, Version.LUCENE_9_7_0, "8b688969-619f-4941-bd69-8d97905374b1");
+    public static final IndexVersion V_8_10_4 = registerIndexVersion(8_10_04_99, Version.LUCENE_9_7_0, "ba2619f3-e303-47ee-b30c-31de233e5294");
     /*
      * READ THE JAVADOC ABOVE BEFORE ADDING NEW INDEX VERSIONS
      * Detached index versions added below here.
      */
     private static class CurrentHolder {
-        private static final IndexVersion CURRENT = findCurrent(V_8_10_3);
+        private static final IndexVersion CURRENT = findCurrent(V_8_10_4);
 
         // finds the pluggable current version, or uses the given fallback
         private static IndexVersion findCurrent(IndexVersion fallback) {