diff --git a/.backportrc.json b/.backportrc.json index ae2d6b2a5e7c..64f2a6a4ff4e 100644 --- a/.backportrc.json +++ b/.backportrc.json @@ -3,8 +3,8 @@ "targetBranchChoices" : [ "main", "8.x", "9.0", "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", + "^v8.17.6$" : "main", "^v8.17.5$" : "8.x", "^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 73ec86508b15..c006b454e154 100644 --- a/.buildkite/pipelines/intake.yml +++ b/.buildkite/pipelines/intake.yml @@ -56,7 +56,7 @@ steps: timeout_in_minutes: 300 matrix: setup: - BWC_VERSION: ["7.17.29", "8.16.7", "8.17.5"] + BWC_VERSION: ["7.17.29", "8.16.7", "8.17.6"] agents: provider: gcp image: family/elasticsearch-ubuntu-2004 diff --git a/.buildkite/pipelines/periodic-fwc.yml b/.buildkite/pipelines/periodic-fwc.yml index da67e9d4caef..1047c75987e7 100644 --- a/.buildkite/pipelines/periodic-fwc.yml +++ b/.buildkite/pipelines/periodic-fwc.yml @@ -10,6 +10,6 @@ steps: buildDirectory: /dev/shm/bk matrix: setup: - FWC_VERSION: ["8.17.0", "8.17.1", "8.17.2", "8.17.3", "8.17.4"] + FWC_VERSION: ["8.17.0", "8.17.1", "8.17.2", "8.17.3", "8.17.4", "8.17.5"] env: FWC_VERSION: {{matrix.FWC_VERSION}} diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml index 14f981ca2dd6..cab2b15008de 100644 --- a/.buildkite/pipelines/periodic-packaging.yml +++ b/.buildkite/pipelines/periodic-packaging.yml @@ -592,8 +592,8 @@ steps: env: BWC_VERSION: 8.16.7 - - label: "{{matrix.image}} / 8.17.5 / packaging-tests-upgrade" - command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.5 + - label: "{{matrix.image}} / 8.17.6 / packaging-tests-upgrade" + command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.6 timeout_in_minutes: 300 matrix: setup: @@ -606,7 +606,7 @@ steps: machineType: custom-16-32768 buildDirectory: /dev/shm/bk env: - BWC_VERSION: 8.17.5 + BWC_VERSION: 8.17.6 - group: packaging-tests-windows steps: diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml index ae05d6a4c8c4..dd3b2218ab86 100644 --- a/.buildkite/pipelines/periodic.yml +++ b/.buildkite/pipelines/periodic.yml @@ -667,8 +667,8 @@ steps: - signal_reason: agent_stop limit: 3 - - label: 8.17.5 / bwc - command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.5#bwcTest + - label: 8.17.6 / bwc + command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.6#bwcTest timeout_in_minutes: 300 agents: provider: gcp @@ -677,7 +677,7 @@ steps: buildDirectory: /dev/shm/bk preemptible: true env: - BWC_VERSION: 8.17.5 + BWC_VERSION: 8.17.6 retry: automatic: - exit_status: "-1" @@ -752,7 +752,7 @@ steps: setup: ES_RUNTIME_JAVA: - openjdk17 - BWC_VERSION: ["7.17.29", "8.16.7", "8.17.5"] + BWC_VERSION: ["7.17.29", "8.16.7", "8.17.6"] agents: provider: gcp image: family/elasticsearch-ubuntu-2004 @@ -800,7 +800,7 @@ steps: - openjdk21 - openjdk22 - openjdk23 - BWC_VERSION: ["7.17.29", "8.16.7", "8.17.5"] + BWC_VERSION: ["7.17.29", "8.16.7", "8.17.6"] agents: provider: gcp image: family/elasticsearch-ubuntu-2004 diff --git a/.ci/bwcVersions b/.ci/bwcVersions index 39f459153a32..e0fedbe87810 100644 --- a/.ci/bwcVersions +++ b/.ci/bwcVersions @@ -34,4 +34,4 @@ BWC_VERSION: - "8.14.3" - "8.15.5" - "8.16.7" - - "8.17.5" + - "8.17.6" diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions index 8e584e092b4e..b241f16a7b6f 100644 --- a/.ci/snapshotBwcVersions +++ b/.ci/snapshotBwcVersions @@ -1,4 +1,4 @@ BWC_VERSION: - "7.17.29" - "8.16.7" - - "8.17.5" + - "8.17.6" diff --git a/build-tools-internal/version.properties b/build-tools-internal/version.properties index c23822e95678..207a01aab898 100644 --- a/build-tools-internal/version.properties +++ b/build-tools-internal/version.properties @@ -1,4 +1,4 @@ -elasticsearch = 8.17.5 +elasticsearch = 8.17.6 lucene = 9.12.0 bundled_jdk_vendor = openjdk diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java index 34efefe9b5be..6b8f7f28fe93 100644 --- a/server/src/main/java/org/elasticsearch/TransportVersions.java +++ b/server/src/main/java/org/elasticsearch/TransportVersions.java @@ -212,6 +212,7 @@ public class TransportVersions { public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_3 = def(8_797_0_03); public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_4 = def(8_797_0_04); public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_5 = def(8_797_0_05); + public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_6 = def(8_797_0_06); /* * STOP! READ THIS FIRST! No, really, diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java index 62be98b8e852..fbb37381987a 100644 --- a/server/src/main/java/org/elasticsearch/Version.java +++ b/server/src/main/java/org/elasticsearch/Version.java @@ -206,7 +206,8 @@ public class Version implements VersionId, ToXContentFragment { public static final Version V_8_17_3 = new Version(8_17_03_99); public static final Version V_8_17_4 = new Version(8_17_04_99); public static final Version V_8_17_5 = new Version(8_17_05_99); - public static final Version CURRENT = V_8_17_5; + public static final Version V_8_17_6 = new Version(8_17_06_99); + public static final Version CURRENT = V_8_17_6; private static final NavigableMap VERSION_IDS; private static final Map VERSION_STRINGS; diff --git a/server/src/main/resources/org/elasticsearch/TransportVersions.csv b/server/src/main/resources/org/elasticsearch/TransportVersions.csv index 1b50c1953654..d2b9a61df3a4 100644 --- a/server/src/main/resources/org/elasticsearch/TransportVersions.csv +++ b/server/src/main/resources/org/elasticsearch/TransportVersions.csv @@ -149,3 +149,4 @@ 8.17.2,8797002 8.17.3,8797003 8.17.4,8797004 +8.17.5,8797005 diff --git a/server/src/main/resources/org/elasticsearch/index/IndexVersions.csv b/server/src/main/resources/org/elasticsearch/index/IndexVersions.csv index 72ed8c6a36f9..1be5e4c91588 100644 --- a/server/src/main/resources/org/elasticsearch/index/IndexVersions.csv +++ b/server/src/main/resources/org/elasticsearch/index/IndexVersions.csv @@ -149,3 +149,4 @@ 8.17.2,8521000 8.17.3,8521000 8.17.4,8521000 +8.17.5,8521000