diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml index 0b156ae9b1658..767c55601076b 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.30", "8.17.11", "8.18.6"] + BWC_VERSION: ["7.17.30", "8.18.6"] agents: provider: gcp image: family/elasticsearch-ubuntu-2404 diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml index 65dff3322aa3f..ac086bc44af27 100644 --- a/.buildkite/pipelines/periodic-packaging.yml +++ b/.buildkite/pipelines/periodic-packaging.yml @@ -593,8 +593,8 @@ steps: env: BWC_VERSION: 8.16.6 - - label: "{{matrix.image}} / 8.17.11 / packaging-tests-upgrade" - command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.11 + - label: "{{matrix.image}} / 8.17.10 / packaging-tests-upgrade" + command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.10 timeout_in_minutes: 300 matrix: setup: @@ -607,7 +607,7 @@ steps: machineType: custom-16-32768 buildDirectory: /dev/shm/bk env: - BWC_VERSION: 8.17.11 + BWC_VERSION: 8.17.10 - label: "{{matrix.image}} / 8.18.6 / packaging-tests-upgrade" command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.6 diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml index add5f37f72723..34597f1835cd7 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.11 / bwc - command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.11#bwcTest + - label: 8.17.10 / bwc + command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.10#bwcTest timeout_in_minutes: 300 agents: provider: gcp @@ -677,7 +677,7 @@ steps: buildDirectory: /dev/shm/bk preemptible: true env: - BWC_VERSION: 8.17.11 + BWC_VERSION: 8.17.10 retry: automatic: - exit_status: "-1" @@ -771,7 +771,7 @@ steps: setup: ES_RUNTIME_JAVA: - openjdk17 - BWC_VERSION: ["7.17.30", "8.17.11", "8.18.6"] + BWC_VERSION: ["7.17.30", "8.18.6"] agents: provider: gcp image: family/elasticsearch-ubuntu-2404 @@ -819,7 +819,7 @@ steps: - openjdk21 - openjdk22 - openjdk23 - BWC_VERSION: ["7.17.30", "8.17.11", "8.18.6"] + BWC_VERSION: ["7.17.30", "8.18.6"] agents: provider: gcp image: family/elasticsearch-ubuntu-2404 diff --git a/.ci/bwcVersions b/.ci/bwcVersions index 7e8e1cc657b7b..4aeffe7fecdbf 100644 --- a/.ci/bwcVersions +++ b/.ci/bwcVersions @@ -34,5 +34,5 @@ BWC_VERSION: - "8.14.3" - "8.15.5" - "8.16.6" - - "8.17.11" + - "8.17.10" - "8.18.6" diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions index 70a6a8f823de9..b5c4848171251 100644 --- a/.ci/snapshotBwcVersions +++ b/.ci/snapshotBwcVersions @@ -1,4 +1,3 @@ BWC_VERSION: - "7.17.30" - - "8.17.11" - "8.18.6" diff --git a/branches.json b/branches.json index 0a515b259cc63..ee07b8e3bb331 100644 --- a/branches.json +++ b/branches.json @@ -13,9 +13,6 @@ { "branch": "8.18" }, - { - "branch": "8.17" - }, { "branch": "7.17" } diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java index a0df75c80d137..1f25c21784c2d 100644 --- a/server/src/main/java/org/elasticsearch/Version.java +++ b/server/src/main/java/org/elasticsearch/Version.java @@ -211,7 +211,6 @@ public class Version implements VersionId, ToXContentFragment { public static final Version V_8_17_8 = new Version(8_17_08_99); public static final Version V_8_17_9 = new Version(8_17_09_99); public static final Version V_8_17_10 = new Version(8_17_10_99); - public static final Version V_8_17_11 = new Version(8_17_11_99); public static final Version V_8_18_0 = new Version(8_18_00_99); public static final Version V_8_18_1 = new Version(8_18_01_99); public static final Version V_8_18_2 = new Version(8_18_02_99);