Skip to content

Commit 6479d02

Browse files
committed
Bump versions after 8.10.1 release
1 parent d4a9dfa commit 6479d02

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.1$" : "main",
6+
"^v8.10.2$" : "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.14", "8.10.1"]
43+
BWC_VERSION: ["7.17.14", "8.10.2"]
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
@@ -1616,6 +1616,22 @@ steps:
16161616
env:
16171617
BWC_VERSION: 8.10.1
16181618

1619+
- label: "{{matrix.image}} / 8.10.2 / packaging-tests-upgrade"
1620+
command: ./.ci/scripts/packaging-test.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.10.2
1621+
timeout_in_minutes: 300
1622+
matrix:
1623+
setup:
1624+
image:
1625+
- rocky-8
1626+
- ubuntu-2004
1627+
agents:
1628+
provider: gcp
1629+
image: family/elasticsearch-{{matrix.image}}
1630+
machineType: custom-16-32768
1631+
buildDirectory: /dev/shm/bk
1632+
env:
1633+
BWC_VERSION: 8.10.2
1634+
16191635
- group: packaging-tests-windows
16201636
steps:
16211637
- label: "{{matrix.image}} / packaging-tests-windows"

.buildkite/pipelines/periodic.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -992,6 +992,16 @@ steps:
992992
buildDirectory: /dev/shm/bk
993993
env:
994994
BWC_VERSION: 8.10.1
995+
- label: 8.10.2 / bwc
996+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.10.2#bwcTest
997+
timeout_in_minutes: 300
998+
agents:
999+
provider: gcp
1000+
image: family/elasticsearch-ubuntu-2004
1001+
machineType: custom-32-98304
1002+
buildDirectory: /dev/shm/bk
1003+
env:
1004+
BWC_VERSION: 8.10.2
9951005
- label: concurrent-search-tests
9961006
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dtests.jvm.argline=-Des.concurrent_search=true -Des.concurrent_search=true check
9971007
timeout_in_minutes: 420

.ci/bwcVersions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,4 @@ BWC_VERSION:
9898
- "8.9.2"
9999
- "8.10.0"
100100
- "8.10.1"
101+
- "8.10.2"

.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.14"
3-
- "8.10.1"
3+
- "8.10.2"

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.1
1+
elasticsearch = 8.10.2
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
@@ -151,7 +151,8 @@ public class Version implements VersionId<Version>, ToXContentFragment {
151151
public static final Version V_8_9_2 = new Version(8_09_02_99, IndexVersion.V_8_9_2);
152152
public static final Version V_8_10_0 = new Version(8_10_00_99, IndexVersion.V_8_10_0);
153153
public static final Version V_8_10_1 = new Version(8_10_01_99, IndexVersion.V_8_10_1);
154-
public static final Version CURRENT = V_8_10_1;
154+
public static final Version V_8_10_2 = new Version(8_10_02_99, IndexVersion.V_8_10_2);
155+
public static final Version CURRENT = V_8_10_2;
155156

156157
private static final NavigableMap<Integer, Version> VERSION_IDS;
157158
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
@@ -182,12 +182,13 @@ private static IndexVersion registerIndexVersion(int id, Version luceneVersion,
182182
public static final IndexVersion V_8_9_2 = registerIndexVersion(8_09_02_99, Version.LUCENE_9_7_0, "14c7d64c-9e25-4265-b4fa-e0c5aca67f14");
183183
public static final IndexVersion V_8_10_0 = registerIndexVersion(8_10_00_99, Version.LUCENE_9_7_0, "2e107286-12ad-4c51-9a6f-f8943663b6e7");
184184
public static final IndexVersion V_8_10_1 = registerIndexVersion(8_10_01_99, Version.LUCENE_9_7_0, "5f4ccc3d-3769-4aef-819d-945c47b9a08b");
185+
public static final IndexVersion V_8_10_2 = registerIndexVersion(8_10_02_99, Version.LUCENE_9_7_0, "afcbbc72-deae-4bb8-82ff-48a5c7eea074");
185186
/*
186187
* READ THE JAVADOC ABOVE BEFORE ADDING NEW INDEX VERSIONS
187188
* Detached index versions added below here.
188189
*/
189190
private static class CurrentHolder {
190-
private static final IndexVersion CURRENT = findCurrent(V_8_10_1);
191+
private static final IndexVersion CURRENT = findCurrent(V_8_10_2);
191192

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

0 commit comments

Comments
 (0)