From f70ff89456d04bce85bfbc3badb72878b03a0327 Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Thu, 26 Jun 2025 15:32:23 +0000 Subject: [PATCH] Bump to version 9.2.0 --- .backportrc.json | 4 ++-- .buildkite/pipelines/intake.yml | 2 +- .buildkite/pipelines/periodic-packaging.yml | 16 +++++++++++++ .buildkite/pipelines/periodic.yml | 23 +++++++++++++++++-- .ci/bwcVersions | 1 + .ci/snapshotBwcVersions | 1 + build-tools-internal/version.properties | 2 +- .../main/java/org/elasticsearch/Version.java | 3 ++- 8 files changed, 45 insertions(+), 7 deletions(-) diff --git a/.backportrc.json b/.backportrc.json index 31698460c282..50cdda5b752e 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -1,9 +1,9 @@ { "upstream" : "elastic/elasticsearch", - "targetBranchChoices" : [ "main", "9.0", "8.19", "8.18", "8.17", "8.16", "8.15", "8.14", "8.13", "8.12", "8.11", "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" ], + "targetBranchChoices" : [ "main", "9.1", "9.0", "8.19", "8.18", "8.17", "8.16", "8.15", "8.14", "8.13", "8.12", "8.11", "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" : { - "^v9.1.0$" : "main", + "^v9.2.0$" : "main", "^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$" : "$1.$2" } } \ No newline at end of file diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml index 93c5c8eecc3f..18dafe732a10 100644 --- a/.buildkite/pipelines/intake.yml +++ b/.buildkite/pipelines/intake.yml @@ -65,7 +65,7 @@ steps: timeout_in_minutes: 300 matrix: setup: - BWC_VERSION: ["8.17.9", "8.18.4", "8.19.0", "9.0.4", "9.1.0"] + BWC_VERSION: ["8.17.9", "8.18.4", "8.19.0", "9.0.4", "9.1.0", "9.2.0"] agents: provider: gcp image: family/elasticsearch-ubuntu-2404 diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml index cac74ac6ebaa..b3663ca0fce9 100644 --- a/.buildkite/pipelines/periodic-packaging.yml +++ b/.buildkite/pipelines/periodic-packaging.yml @@ -382,6 +382,22 @@ steps: env: BWC_VERSION: 9.1.0 + - label: "{{matrix.image}} / 9.2.0 / packaging-tests-upgrade" + command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.2.0 + timeout_in_minutes: 300 + matrix: + setup: + image: + - rocky-8 + - ubuntu-2404 + agents: + provider: gcp + image: family/elasticsearch-{{matrix.image}} + machineType: custom-16-32768 + buildDirectory: /dev/shm/bk + env: + BWC_VERSION: 9.2.0 + - group: packaging-tests-windows steps: - label: "{{matrix.image}} / packaging-tests-windows" diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml index 5c6af6ba91a5..fd1217fd1d31 100644 --- a/.buildkite/pipelines/periodic.yml +++ b/.buildkite/pipelines/periodic.yml @@ -420,6 +420,25 @@ steps: - signal_reason: agent_stop limit: 3 + - label: 9.2.0 / bwc + command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.2.0#bwcTest + timeout_in_minutes: 300 + agents: + provider: gcp + image: family/elasticsearch-ubuntu-2404 + machineType: n1-standard-32 + buildDirectory: /dev/shm/bk + preemptible: true + env: + BWC_VERSION: 9.2.0 + retry: + automatic: + - exit_status: "-1" + limit: 3 + signal_reason: none + - signal_reason: agent_stop + limit: 3 + - 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 functionalTests timeout_in_minutes: 420 @@ -487,7 +506,7 @@ steps: setup: ES_RUNTIME_JAVA: - openjdk21 - BWC_VERSION: ["8.17.9", "8.18.4", "8.19.0", "9.0.4", "9.1.0"] + BWC_VERSION: ["8.17.9", "8.18.4", "8.19.0", "9.0.4", "9.1.0", "9.2.0"] agents: provider: gcp image: family/elasticsearch-ubuntu-2404 @@ -531,7 +550,7 @@ steps: ES_RUNTIME_JAVA: - openjdk21 - openjdk23 - BWC_VERSION: ["8.17.9", "8.18.4", "8.19.0", "9.0.4", "9.1.0"] + BWC_VERSION: ["8.17.9", "8.18.4", "8.19.0", "9.0.4", "9.1.0", "9.2.0"] agents: provider: gcp image: family/elasticsearch-ubuntu-2404 diff --git a/.ci/bwcVersions b/.ci/bwcVersions index 33f7091cad16..bb383b759d09 100644 --- a/.ci/bwcVersions +++ b/.ci/bwcVersions @@ -21,3 +21,4 @@ BWC_VERSION: - "8.19.0" - "9.0.4" - "9.1.0" + - "9.2.0" diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions index 2df77ed9ede1..2092e0da165c 100644 --- a/.ci/snapshotBwcVersions +++ b/.ci/snapshotBwcVersions @@ -4,3 +4,4 @@ BWC_VERSION: - "8.19.0" - "9.0.4" - "9.1.0" + - "9.2.0" diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index 8694c73ad099..c443b280e3dd 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -1,4 +1,4 @@ -elasticsearch = 9.1.0 +elasticsearch = 9.2.0 lucene = 10.2.2 bundled_jdk_vendor = openjdk diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java index 925370623a88..6b8959f0c775 100644 --- a/server/src/main/java/org/elasticsearch/Version.java +++ b/server/src/main/java/org/elasticsearch/Version.java @@ -217,7 +217,8 @@ public class Version implements VersionId, 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_1_0 = new Version(9_01_00_99); - public static final Version CURRENT = V_9_1_0; + public static final Version V_9_2_0 = new Version(9_02_00_99); + public static final Version CURRENT = V_9_2_0; private static final NavigableMap VERSION_IDS; private static final Map VERSION_STRINGS;