Skip to content

Commit

Permalink
Bump versions after 8.10.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
mark-vieira committed Sep 12, 2023
1 parent 26af09c commit b61a256
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 23 deletions.
4 changes: 2 additions & 2 deletions .backportrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"upstream" : "elastic/elasticsearch",
"targetBranchChoices" : [ "main", "8.9", "8.8", "8.7", "8.6", "8.5", "8.4", "8.3", "8.2", "8.1", "8.0", "7.17", "6.8" ],
"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.0$" : "main",
"^v8.10.1$" : "main",
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2"
}
}
2 changes: 1 addition & 1 deletion .buildkite/pipelines/intake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ steps:
timeout_in_minutes: 300
matrix:
setup:
BWC_VERSION: ["7.17.14", "8.9.3", "8.10.0"]
BWC_VERSION: ["7.17.14", "8.10.1"]
agents:
provider: gcp
image: family/elasticsearch-ubuntu-2004
Expand Down
12 changes: 6 additions & 6 deletions .buildkite/pipelines/periodic-packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1584,8 +1584,8 @@ steps:
env:
BWC_VERSION: 8.9.2

- label: "{{matrix.image}} / 8.9.3 / packaging-tests-upgrade"
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.9.3
- label: "{{matrix.image}} / 8.10.0 / packaging-tests-upgrade"
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.0
timeout_in_minutes: 300
matrix:
setup:
Expand All @@ -1598,10 +1598,10 @@ steps:
machineType: custom-16-32768
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.9.3
BWC_VERSION: 8.10.0

- label: "{{matrix.image}} / 8.10.0 / packaging-tests-upgrade"
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.0
- label: "{{matrix.image}} / 8.10.1 / packaging-tests-upgrade"
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.1
timeout_in_minutes: 300
matrix:
setup:
Expand All @@ -1614,7 +1614,7 @@ steps:
machineType: custom-16-32768
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.10.0
BWC_VERSION: 8.10.1

- group: packaging-tests-windows
steps:
Expand Down
12 changes: 6 additions & 6 deletions .buildkite/pipelines/periodic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -972,26 +972,26 @@ steps:
buildDirectory: /dev/shm/bk
env:
BWC_VERSION: 8.9.2
- label: 8.9.3 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.9.3#bwcTest
- label: 8.10.0 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.10.0#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.9.3
- label: 8.10.0 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.10.0#bwcTest
BWC_VERSION: 8.10.0
- label: 8.10.1 / bwc
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.10.1#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.0
BWC_VERSION: 8.10.1
- 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
Expand Down
2 changes: 1 addition & 1 deletion .ci/bwcVersions
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,5 @@ BWC_VERSION:
- "8.9.0"
- "8.9.1"
- "8.9.2"
- "8.9.3"
- "8.10.0"
- "8.10.1"
3 changes: 1 addition & 2 deletions .ci/snapshotBwcVersions
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
BWC_VERSION:
- "7.17.14"
- "8.9.3"
- "8.10.0"
- "8.10.1"
2 changes: 1 addition & 1 deletion build-tools-internal/version.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
elasticsearch = 8.10.0
elasticsearch = 8.10.1
lucene = 9.7.0

bundled_jdk_vendor = openjdk
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/org/elasticsearch/Version.java
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ public class Version implements VersionId<Version>, ToXContentFragment {
public static final Version V_8_9_0 = new Version(8_09_00_99, IndexVersion.V_8_9_0);
public static final Version V_8_9_1 = new Version(8_09_01_99, IndexVersion.V_8_9_1);
public static final Version V_8_9_2 = new Version(8_09_02_99, IndexVersion.V_8_9_2);
public static final Version V_8_9_3 = new Version(8_09_03_99, IndexVersion.V_8_9_3);
public static final Version V_8_10_0 = new Version(8_10_00_99, IndexVersion.V_8_10_0);
public static final Version CURRENT = V_8_10_0;
public static final Version V_8_10_1 = new Version(8_10_01_99, IndexVersion.V_8_10_1);
public static final Version CURRENT = V_8_10_1;

private static final NavigableMap<Integer, Version> VERSION_IDS;
private static final Map<String, Version> VERSION_STRINGS;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,14 @@ private static IndexVersion registerIndexVersion(int id, Version luceneVersion,
public static final IndexVersion V_8_9_0 = registerIndexVersion(8_09_00_99, Version.LUCENE_9_7_0, "32f6dbab-cc24-4f5b-87b5-015a848480d9");
public static final IndexVersion V_8_9_1 = registerIndexVersion(8_09_01_99, Version.LUCENE_9_7_0, "955a80ac-f70c-40a5-9399-1d8a1e5d342d");
public static final IndexVersion V_8_9_2 = registerIndexVersion(8_09_02_99, Version.LUCENE_9_7_0, "14c7d64c-9e25-4265-b4fa-e0c5aca67f14");
public static final IndexVersion V_8_9_3 = registerIndexVersion(8_09_03_99, Version.LUCENE_9_7_0, "abbd4418-1d46-4fec-8faf-758b38b205b0");
public static final IndexVersion V_8_10_0 = registerIndexVersion(8_10_00_99, Version.LUCENE_9_7_0, "2e107286-12ad-4c51-9a6f-f8943663b6e7");
public static final IndexVersion V_8_10_1 = registerIndexVersion(8_10_01_99, Version.LUCENE_9_7_0, "5f4ccc3d-3769-4aef-819d-945c47b9a08b");
/*
* 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_0);
private static final IndexVersion CURRENT = findCurrent(V_8_10_1);

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

0 comments on commit b61a256

Please sign in to comment.