Skip to content

Commit 4dbba59

Browse files
committed
Disable BWC tests against 5.6.17 snapshots
1 parent 077a471 commit 4dbba59

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

buildSrc/src/main/java/org/elasticsearch/gradle/VersionCollection.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@ protected VersionCollection(List<String> versionLines, Version currentVersionPro
126126
.orElseThrow(() -> new IllegalStateException("Unexpected number of versions in collection"))
127127
);
128128

129+
// Previous major branch is dead so ignore the latest version which will never be released
130+
Version previousMajorUnreleased = getLatestVersionByKey(this.groupByMajor, currentVersion.getMajor() - 1);
131+
groupByMajor.get(currentVersion.getMajor() - 1).remove(previousMajorUnreleased);
132+
129133
assertCurrentVersionMatchesParsed(currentVersionProperty);
130134

131135
assertNoOlderThanTwoMajors();
@@ -206,7 +210,8 @@ public List<Version> getUnreleased() {
206210
unreleased.add(currentVersion);
207211

208212
// the tip of the previous major is unreleased for sure, be it a minor or a bugfix
209-
unreleased.add(getLatestVersionByKey(this.groupByMajor, currentVersion.getMajor() - 1));
213+
// The 5.6 release train will have no further releases so don't test against unreleased snapshots
214+
// unreleased.add(getLatestVersionByKey(this.groupByMajor, currentVersion.getMajor() - 1));
210215

211216
final Map<Integer, List<Version>> groupByMinor = getReleasedMajorGroupedByMinor();
212217
int greatestMinor = groupByMinor.keySet().stream().max(Integer::compareTo).orElse(0);

qa/verify-version-constants/build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,10 @@ unitTest.enabled = false
6060

6161
task bwcTestSnapshots {
6262
if (project.bwc_tests_enabled) {
63-
final def version = bwcVersions.unreleasedIndexCompatible.first()
64-
dependsOn "v${version}#bwcTest"
63+
if (bwcVersions.unreleasedIndexCompatible.isEmpty() == false) {
64+
final def version = bwcVersions.unreleasedIndexCompatible.first()
65+
dependsOn "v${version}#bwcTest"
66+
}
6567
}
6668
}
6769

0 commit comments

Comments
 (0)