Remove BWC testing of snapshot 6.8 versions (#104226)

mark-vieira · web-flow · commit 9923a8719fc9 · 2024-01-10T14:21:56.000-08:00
diff --git a/.buildkite/pipelines/intake.template.yml b/.buildkite/pipelines/intake.template.yml
@@ -24,21 +24,6 @@ steps:
       image: family/elasticsearch-ubuntu-2004
       machineType: n1-standard-32
       buildDirectory: /dev/shm/bk
-  - group: bwc-snapshots
-    steps:
-      - label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files v$$BWC_VERSION#bwcTest
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            BWC_VERSION: $BWC_LIST
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: custom-32-98304
-          buildDirectory: /dev/shm/bk
-        env:
-          BWC_VERSION: "{{matrix.BWC_VERSION}}"
   - wait
   - trigger: elasticsearch-dra-workflow
     label: Trigger DRA snapshot workflow
diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml
@@ -25,21 +25,6 @@ steps:
       image: family/elasticsearch-ubuntu-2004
       machineType: n1-standard-32
       buildDirectory: /dev/shm/bk
-  - group: bwc-snapshots
-    steps:
-      - label: "{{matrix.BWC_VERSION}} / bwc-snapshots"
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files v$$BWC_VERSION#bwcTest
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            BWC_VERSION: ["6.8.24"]
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: custom-32-98304
-          buildDirectory: /dev/shm/bk
-        env:
-          BWC_VERSION: "{{matrix.BWC_VERSION}}"
   - wait
   - trigger: elasticsearch-dra-workflow
     label: Trigger DRA snapshot workflow
diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml
@@ -896,22 +896,6 @@ steps:
         env:
           BWC_VERSION: 6.8.23
 
-      - label: "{{matrix.image}} / 6.8.24 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v6.8.24
-        timeout_in_minutes: 300
-        matrix:
-          setup:
-            image:
-              - rocky-8
-              - ubuntu-2004
-        agents:
-          provider: gcp
-          image: family/elasticsearch-{{matrix.image}}
-          machineType: custom-16-32768
-          buildDirectory: /dev/shm/bk
-        env:
-          BWC_VERSION: 6.8.24
-
       - label: "{{matrix.image}} / 7.0.0 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v7.0.0
         timeout_in_minutes: 300
diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml
@@ -542,16 +542,6 @@ steps:
           buildDirectory: /dev/shm/bk
         env:
           BWC_VERSION: 6.8.23
-      - label: 6.8.24 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v6.8.24#bwcTest
-        timeout_in_minutes: 300
-        agents:
-          provider: gcp
-          image: family/elasticsearch-ubuntu-2004
-          machineType: n1-standard-32
-          buildDirectory: /dev/shm/bk
-        env:
-          BWC_VERSION: 6.8.24
       - label: 7.0.0 / bwc
         command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v7.0.0#bwcTest
         timeout_in_minutes: 300
diff --git a/.buildkite/pipelines/pull-request/bwc-snapshots-windows.yml b/.buildkite/pipelines/pull-request/bwc-snapshots-windows.yml
diff --git a/.buildkite/pipelines/pull-request/bwc-snapshots.yml b/.buildkite/pipelines/pull-request/bwc-snapshots.yml
diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -53,7 +53,6 @@ BWC_VERSION:
   - "6.8.21"
   - "6.8.22"
   - "6.8.23"
-  - "6.8.24"
   - "7.0.0"
   - "7.0.1"
   - "7.1.0"
diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions
@@ -1,2 +1 @@
 BWC_VERSION:
-  - "6.8.24"
diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java
@@ -249,17 +249,6 @@ public List<Version> getUnreleased() {
         // The current version is being worked, is always unreleased
         unreleased.add(currentVersion);
 
-        // the tip of the previous major is unreleased for sure, be it a minor or a bugfix
-        final Version latestOfPreviousMajor = getLatestVersionByKey(this.groupByMajor, currentVersion.getMajor() - 1);
-        unreleased.add(latestOfPreviousMajor);
-        if (latestOfPreviousMajor.getRevision() == 0) {
-            // if the previous major is a x.y.0 release, then the tip of the minor before that (y-1) is also unreleased
-            final Version previousMinor = getLatestInMinor(latestOfPreviousMajor.getMajor(), latestOfPreviousMajor.getMinor() - 1);
-            if (previousMinor != null) {
-                unreleased.add(previousMinor);
-            }
-        }
-
         final Map<Integer, List<Version>> groupByMinor = getReleasedMajorGroupedByMinor();
         int greatestMinor = groupByMinor.keySet().stream().max(Integer::compareTo).orElse(0);
 
diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java
@@ -109,7 +109,6 @@ public class Version implements Comparable<Version>, ToXContentFragment {
     public static final Version V_6_8_21 = new Version(6_08_21_99, LUCENE_7_7_3);
     public static final Version V_6_8_22 = new Version(6_08_22_99, LUCENE_7_7_3);
     public static final Version V_6_8_23 = new Version(6_08_23_99, LUCENE_7_7_3);
-    public static final Version V_6_8_24 = new Version(6_08_24_99, LUCENE_7_7_3);
     public static final Version V_7_0_0 = new Version(7_00_00_99, org.apache.lucene.util.Version.LUCENE_8_0_0);
     public static final Version V_7_0_1 = new Version(7_00_01_99, org.apache.lucene.util.Version.LUCENE_8_0_0);
     public static final Version V_7_1_0 = new Version(7_01_00_99, org.apache.lucene.util.Version.LUCENE_8_0_0);
diff --git a/test/framework/src/main/java/org/elasticsearch/test/VersionUtils.java b/test/framework/src/main/java/org/elasticsearch/test/VersionUtils.java
@@ -56,12 +56,6 @@ static Tuple<List<Version>, List<Version>> resolveReleasedVersions(Version curre
         } else {
             // on a stable or release branch, ie N.x
             stableVersions = currentMajor;
-            // remove the next maintenance bugfix
-            final Version prevMajorLastMinor = moveLastToUnreleased(previousMajor, unreleasedVersions);
-            if (prevMajorLastMinor.revision == 0 && previousMajor.isEmpty() == false) {
-                // The latest minor in the previous major is a ".0" release, so there must be an unreleased bugfix for the minor before that
-                moveLastToUnreleased(previousMajor, unreleasedVersions);
-            }
         }
 
         // remove next minor
diff --git a/test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java b/test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java
@@ -116,14 +116,15 @@ public void testResolveReleasedVersionsForReleaseBranch() {
             equalTo(
                 Arrays.asList(
                     TestReleaseBranch.V_4_0_0,
+                    TestReleaseBranch.V_4_0_1,
                     TestReleaseBranch.V_5_3_0,
                     TestReleaseBranch.V_5_3_1,
                     TestReleaseBranch.V_5_3_2,
                     TestReleaseBranch.V_5_4_0
                 )
             )
         );
-        assertThat(unreleased, equalTo(Arrays.asList(TestReleaseBranch.V_4_0_1, TestReleaseBranch.V_5_4_1)));
+        assertThat(unreleased, equalTo(Arrays.asList(TestReleaseBranch.V_5_4_1)));
     }
 
     public static class TestStableBranch {
@@ -141,8 +142,11 @@ public void testResolveReleasedVersionsForUnreleasedStableBranch() {
         List<Version> released = t.v1();
         List<Version> unreleased = t.v2();
 
-        assertThat(released, equalTo(Arrays.asList(TestStableBranch.V_4_0_0, TestStableBranch.V_5_0_0, TestStableBranch.V_5_0_1)));
-        assertThat(unreleased, equalTo(Arrays.asList(TestStableBranch.V_4_0_1, TestStableBranch.V_5_0_2, TestStableBranch.V_5_1_0)));
+        assertThat(
+            released,
+            equalTo(Arrays.asList(TestStableBranch.V_4_0_0, TestStableBranch.V_4_0_1, TestStableBranch.V_5_0_0, TestStableBranch.V_5_0_1))
+        );
+        assertThat(unreleased, equalTo(Arrays.asList(TestStableBranch.V_5_0_2, TestStableBranch.V_5_1_0)));
     }
 
     public static class TestStableBranchBehindStableBranch {
@@ -169,6 +173,7 @@ public void testResolveReleasedVersionsForStableBranchBehindStableBranch() {
             equalTo(
                 Arrays.asList(
                     TestStableBranchBehindStableBranch.V_4_0_0,
+                    TestStableBranchBehindStableBranch.V_4_0_1,
                     TestStableBranchBehindStableBranch.V_5_3_0,
                     TestStableBranchBehindStableBranch.V_5_3_1
                 )
@@ -178,7 +183,6 @@ public void testResolveReleasedVersionsForStableBranchBehindStableBranch() {
             unreleased,
             equalTo(
                 Arrays.asList(
-                    TestStableBranchBehindStableBranch.V_4_0_1,
                     TestStableBranchBehindStableBranch.V_5_3_2,
                     TestStableBranchBehindStableBranch.V_5_4_0,
                     TestStableBranchBehindStableBranch.V_5_5_0
@@ -286,6 +290,7 @@ public void testResolveReleasedVersionsAtVersionBumpIn6x() {
                 Arrays.asList(
                     TestVersionBumpIn6x.V_5_6_0,
                     TestVersionBumpIn6x.V_5_6_1,
+                    TestVersionBumpIn6x.V_5_6_2,
                     TestVersionBumpIn6x.V_6_0_0_alpha1,
                     TestVersionBumpIn6x.V_6_0_0_alpha2,
                     TestVersionBumpIn6x.V_6_0_0_beta1,
@@ -294,10 +299,7 @@ public void testResolveReleasedVersionsAtVersionBumpIn6x() {
                 )
             )
         );
-        assertThat(
-            unreleased,
-            equalTo(Arrays.asList(TestVersionBumpIn6x.V_5_6_2, TestVersionBumpIn6x.V_6_0_1, TestVersionBumpIn6x.V_6_1_0))
-        );
+        assertThat(unreleased, equalTo(Arrays.asList(TestVersionBumpIn6x.V_6_0_1, TestVersionBumpIn6x.V_6_1_0)));
     }
 
     public static class TestNewMinorBranchIn6x {
@@ -331,6 +333,7 @@ public void testResolveReleasedVersionsAtNewMinorBranchIn6x() {
                 Arrays.asList(
                     TestNewMinorBranchIn6x.V_5_6_0,
                     TestNewMinorBranchIn6x.V_5_6_1,
+                    TestNewMinorBranchIn6x.V_5_6_2,
                     TestNewMinorBranchIn6x.V_6_0_0_alpha1,
                     TestNewMinorBranchIn6x.V_6_0_0_alpha2,
                     TestNewMinorBranchIn6x.V_6_0_0_beta1,
@@ -342,10 +345,7 @@ public void testResolveReleasedVersionsAtNewMinorBranchIn6x() {
                 )
             )
         );
-        assertThat(
-            unreleased,
-            equalTo(Arrays.asList(TestNewMinorBranchIn6x.V_5_6_2, TestNewMinorBranchIn6x.V_6_1_2, TestNewMinorBranchIn6x.V_6_2_0))
-        );
+        assertThat(unreleased, equalTo(Arrays.asList(TestNewMinorBranchIn6x.V_6_1_2, TestNewMinorBranchIn6x.V_6_2_0)));
     }
 
     /**
