Skip to content

Commit b61e840

Browse files
jozalajozala
authored
Close 8.18 and 9.0 development branches (elastic#136620) (elastic#136682)
No additional 8.18.x or 9.0.x versions are planned. Versions 8.18.9 and 9.0.9 removed as they were only snapshots and never released. (cherry picked from commit 8d24667) # Conflicts: # .buildkite/pipelines/intake.yml # .buildkite/pipelines/periodic-java-ea.yml # .buildkite/pipelines/periodic.yml # branches.json
1 parent bc0b903 commit b61e840

File tree

7 files changed

+24
-28
lines changed

7 files changed

+24
-28
lines changed

‎.buildkite/pipelines/intake.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ steps:
6565
timeout_in_minutes: 300
6666
matrix:
6767
setup:
68-
BWC_VERSION: ["8.18.9", "8.19.6", "9.0.9", "9.1.6"]
68+
BWC_VERSION: ["8.19.6", "9.1.6"]
6969
agents:
7070
provider: gcp
7171
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/periodic-java-ea.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,8 @@ steps:
347347
- signal_reason: agent_stop
348348
limit: 3
349349

350-
- label: 8.18.9 / bwc
351-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.18.9#bwcTest
350+
- label: 8.18.8 / bwc
351+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v8.18.8#bwcTest
352352
timeout_in_minutes: 300
353353
agents:
354354
provider: gcp
@@ -357,7 +357,7 @@ steps:
357357
buildDirectory: /dev/shm/bk
358358
preemptible: true
359359
env:
360-
BWC_VERSION: 8.18.9
360+
BWC_VERSION: 8.18.8
361361
retry:
362362
automatic:
363363
- exit_status: "-1"
@@ -385,8 +385,8 @@ steps:
385385
- signal_reason: agent_stop
386386
limit: 3
387387

388-
- label: 9.0.9 / bwc
389-
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.0.9#bwcTest
388+
- label: 9.0.8 / bwc
389+
command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION -Dbwc.checkout.align=true v9.0.8#bwcTest
390390
timeout_in_minutes: 300
391391
agents:
392392
provider: gcp
@@ -395,7 +395,7 @@ steps:
395395
buildDirectory: /dev/shm/bk
396396
preemptible: true
397397
env:
398-
BWC_VERSION: 9.0.9
398+
BWC_VERSION: 9.0.8
399399
retry:
400400
automatic:
401401
- exit_status: "-1"
@@ -477,7 +477,7 @@ steps:
477477
timeout_in_minutes: 300
478478
matrix:
479479
setup:
480-
BWC_VERSION: ["8.18.9", "8.19.6", "9.0.9", "9.1.6"]
480+
BWC_VERSION: ["8.19.6", "9.1.6"]
481481
agents:
482482
provider: gcp
483483
image: family/elasticsearch-ubuntu-2404

‎.buildkite/pipelines/periodic-packaging.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -318,8 +318,8 @@ steps:
318318
env:
319319
BWC_VERSION: 8.17.10
320320

321-
- label: "{{matrix.image}} / 8.18.9 / packaging-tests-upgrade"
322-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.9
321+
- label: "{{matrix.image}} / 8.18.8 / packaging-tests-upgrade"
322+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.8
323323
timeout_in_minutes: 300
324324
matrix:
325325
setup:
@@ -332,7 +332,7 @@ steps:
332332
machineType: custom-16-32768
333333
buildDirectory: /dev/shm/bk
334334
env:
335-
BWC_VERSION: 8.18.9
335+
BWC_VERSION: 8.18.8
336336

337337
- label: "{{matrix.image}} / 8.19.6 / packaging-tests-upgrade"
338338
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.19.6
@@ -350,8 +350,8 @@ steps:
350350
env:
351351
BWC_VERSION: 8.19.6
352352

353-
- label: "{{matrix.image}} / 9.0.9 / packaging-tests-upgrade"
354-
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.9
353+
- label: "{{matrix.image}} / 9.0.8 / packaging-tests-upgrade"
354+
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.0.8
355355
timeout_in_minutes: 300
356356
matrix:
357357
setup:
@@ -364,7 +364,7 @@ steps:
364364
machineType: custom-16-32768
365365
buildDirectory: /dev/shm/bk
366366
env:
367-
BWC_VERSION: 9.0.9
367+
BWC_VERSION: 9.0.8
368368

369369
- label: "{{matrix.image}} / 9.1.6 / packaging-tests-upgrade"
370370
command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v9.1.6

‎.buildkite/pipelines/periodic.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ steps:
344344
- signal_reason: agent_stop
345345
limit: 3
346346

347-
- label: 8.18.9 / bwc
348-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.9#bwcTest
347+
- label: 8.18.8 / bwc
348+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.18.8#bwcTest
349349
timeout_in_minutes: 300
350350
agents:
351351
provider: gcp
@@ -354,7 +354,7 @@ steps:
354354
buildDirectory: /dev/shm/bk
355355
preemptible: true
356356
env:
357-
BWC_VERSION: 8.18.9
357+
BWC_VERSION: 8.18.8
358358
retry:
359359
automatic:
360360
- exit_status: "-1"
@@ -382,8 +382,8 @@ steps:
382382
- signal_reason: agent_stop
383383
limit: 3
384384

385-
- label: 9.0.9 / bwc
386-
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.9#bwcTest
385+
- label: 9.0.8 / bwc
386+
command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v9.0.8#bwcTest
387387
timeout_in_minutes: 300
388388
agents:
389389
provider: gcp
@@ -392,7 +392,7 @@ steps:
392392
buildDirectory: /dev/shm/bk
393393
preemptible: true
394394
env:
395-
BWC_VERSION: 9.0.9
395+
BWC_VERSION: 9.0.8
396396
retry:
397397
automatic:
398398
- exit_status: "-1"
@@ -487,7 +487,7 @@ steps:
487487
setup:
488488
ES_RUNTIME_JAVA:
489489
- openjdk21
490-
BWC_VERSION: ["8.18.9", "8.19.6", "9.0.9", "9.1.6"]
490+
BWC_VERSION: ["8.19.6", "9.1.6"]
491491
agents:
492492
provider: gcp
493493
image: family/elasticsearch-ubuntu-2404
@@ -531,7 +531,7 @@ steps:
531531
ES_RUNTIME_JAVA:
532532
- openjdk21
533533
- openjdk23
534-
BWC_VERSION: ["8.18.9", "8.19.6", "9.0.9", "9.1.6"]
534+
BWC_VERSION: ["8.19.6", "9.1.6"]
535535
agents:
536536
provider: gcp
537537
image: family/elasticsearch-ubuntu-2404

‎.ci/bwcVersions‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ BWC_VERSION:
1717
- "8.15.5"
1818
- "8.16.6"
1919
- "8.17.10"
20-
- "8.18.9"
20+
- "8.18.8"
2121
- "8.19.6"
22-
- "9.0.9"
22+
- "9.0.8"
2323
- "9.1.6"

‎.ci/snapshotBwcVersions‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
BWC_VERSION:
2-
- "8.18.9"
32
- "8.19.6"
4-
- "9.0.9"
53
- "9.1.6"

‎server/src/main/java/org/elasticsearch/Version.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ public class Version implements VersionId<Version>, ToXContentFragment {
215215
public static final Version V_8_18_6 = new Version(8_18_06_99);
216216
public static final Version V_8_18_7 = new Version(8_18_07_99);
217217
public static final Version V_8_18_8 = new Version(8_18_08_99);
218-
public static final Version V_8_18_9 = new Version(8_18_09_99);
219218
public static final Version V_8_19_0 = new Version(8_19_00_99);
220219
public static final Version V_8_19_1 = new Version(8_19_01_99);
221220
public static final Version V_8_19_2 = new Version(8_19_02_99);
@@ -232,7 +231,6 @@ public class Version implements VersionId<Version>, ToXContentFragment {
232231
public static final Version V_9_0_6 = new Version(9_00_06_99);
233232
public static final Version V_9_0_7 = new Version(9_00_07_99);
234233
public static final Version V_9_0_8 = new Version(9_00_08_99);
235-
public static final Version V_9_0_9 = new Version(9_00_09_99);
236234
public static final Version V_9_1_0 = new Version(9_01_00_99);
237235
public static final Version V_9_1_1 = new Version(9_01_01_99);
238236
public static final Version V_9_1_2 = new Version(9_01_02_99);

0 commit comments

Comments
 (0)