Skip to content

Commit 1465601

Browse files
committed
Bump versions after 8.10.3 release
1 parent b216d95 commit 1465601

File tree

9 files changed

+35
-6
lines changed

9 files changed

+35
-6
lines changed

.backportrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"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" ],
44
"targetPRLabels" : [ "backport" ],
55
"branchLabelMapping" : {
6-
"^v8.10.3$" : "main",
6+
"^v8.10.4$" : "main",
77
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
88
}
99
}

.buildkite/pipelines/intake.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ steps:
4040
timeout_in_minutes: 300
4141
matrix:
4242
setup:
43-
BWC_VERSION: ["7.17.15", "8.10.3"]
43+
BWC_VERSION: ["7.17.15", "8.10.4"]
4444
agents:
4545
provider: gcp
4646
image: family/elasticsearch-ubuntu-2004

.buildkite/pipelines/periodic-packaging.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1664,6 +1664,22 @@ steps:
16641664
env:
16651665
BWC_VERSION: 8.10.3
16661666

1667+
- label: "{{matrix.image}} / 8.10.4 / packaging-tests-upgrade"
1668+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.10.4
1669+
timeout_in_minutes: 300
1670+
matrix:
1671+
setup:
1672+
image:
1673+
- rocky-8
1674+
- ubuntu-2004
1675+
agents:
1676+
provider: gcp
1677+
image: family/elasticsearch-{{matrix.image}}
1678+
machineType: custom-16-32768
1679+
buildDirectory: /dev/shm/bk
1680+
env:
1681+
BWC_VERSION: 8.10.4
1682+
16671683
- group: packaging-tests-windows
16681684
steps:
16691685
- label: "{{matrix.image}} / packaging-tests-windows"

.buildkite/pipelines/periodic.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,6 +1022,16 @@ steps:
10221022
buildDirectory: /dev/shm/bk
10231023
env:
10241024
BWC_VERSION: 8.10.3
1025+
- label: 8.10.4 / bwc
1026+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.10.4#bwcTest
1027+
timeout_in_minutes: 300
1028+
agents:
1029+
provider: gcp
1030+
image: family/elasticsearch-ubuntu-2004
1031+
machineType: custom-32-98304
1032+
buildDirectory: /dev/shm/bk
1033+
env:
1034+
BWC_VERSION: 8.10.4
10251035
- label: concurrent-search-tests
10261036
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true check
10271037
timeout_in_minutes: 420

.ci/bwcVersions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,3 +101,4 @@ BWC_VERSION:
101101
- "8.10.1"
102102
- "8.10.2"
103103
- "8.10.3"
104+
- "8.10.4"

.ci/snapshotBwcVersions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
BWC_VERSION:
22
- "7.17.15"
3-
- "8.10.3"
3+
- "8.10.4"

build-tools-internal/version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
elasticsearch = 8.10.3
1+
elasticsearch = 8.10.4
22
lucene = 9.7.0
33

44
bundled_jdk_vendor = openjdk

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ public class Version implements VersionId<Version>, ToXContentFragment {
154154
public static final Version V_8_10_1 = new Version(8_10_01_99, IndexVersion.V_8_10_1);
155155
public static final Version V_8_10_2 = new Version(8_10_02_99, IndexVersion.V_8_10_2);
156156
public static final Version V_8_10_3 = new Version(8_10_03_99, IndexVersion.V_8_10_3);
157-
public static final Version CURRENT = V_8_10_3;
157+
public static final Version V_8_10_4 = new Version(8_10_04_99, IndexVersion.V_8_10_4);
158+
public static final Version CURRENT = V_8_10_4;
158159

159160
private static final NavigableMap<Integer, Version> VERSION_IDS;
160161
private static final Map<String, Version> VERSION_STRINGS;

server/src/main/java/org/elasticsearch/index/IndexVersion.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,12 +185,13 @@ private static IndexVersion registerIndexVersion(int id, Version luceneVersion,
185185
public static final IndexVersion V_8_10_1 = registerIndexVersion(8_10_01_99, Version.LUCENE_9_7_0, "5f4ccc3d-3769-4aef-819d-945c47b9a08b");
186186
public static final IndexVersion V_8_10_2 = registerIndexVersion(8_10_02_99, Version.LUCENE_9_7_0, "afcbbc72-deae-4bb8-82ff-48a5c7eea074");
187187
public static final IndexVersion V_8_10_3 = registerIndexVersion(8_10_03_99, Version.LUCENE_9_7_0, "8b688969-619f-4941-bd69-8d97905374b1");
188+
public static final IndexVersion V_8_10_4 = registerIndexVersion(8_10_04_99, Version.LUCENE_9_7_0, "ba2619f3-e303-47ee-b30c-31de233e5294");
188189
/*
189190
* READ THE JAVADOC ABOVE BEFORE ADDING NEW INDEX VERSIONS
190191
* Detached index versions added below here.
191192
*/
192193
private static class CurrentHolder {
193-
private static final IndexVersion CURRENT = findCurrent(V_8_10_3);
194+
private static final IndexVersion CURRENT = findCurrent(V_8_10_4);
194195

195196
// finds the pluggable current version, or uses the given fallback
196197
private static IndexVersion findCurrent(IndexVersion fallback) {

0 commit comments

Comments
 (0)