Teach the build about betas and rcs (#26066)
The build was ignoring suffixes like "beta1" and "rc1" on the version numbers which was causing the backwards compatibility packaging tests to fail because they expected to be upgrading from 6.0.0 even though they were actually upgrading from 6.0.0-beta1. This adds the suffixes to the information that the build scrapes from Version.java. It then uses those suffixes when it resolves artifacts build from the bwc branch and for testing. Closes #26017
This commit is contained in:
Nik Everett
GitHub
parent
9c372e533e
commit
99ac7beb8e
27
build.gradle
27
build.gradle
|
|
@ -64,10 +64,10 @@ configure(subprojects.findAll { it.projectDir.toPath().startsWith(rootPath) }) {
|
|||
|
||||
/* Introspect all versions of ES that may be tested agains for backwards
|
||||
* compatibility. It is *super* important that this logic is the same as the
|
||||
* logic in VersionUtils.java, modulo alphas, betas, and rcs which are ignored
|
||||
* in gradle because they don't have any backwards compatibility guarantees
|
||||
* but are not ignored in VersionUtils.java because the tests expect them not
|
||||
* to be. */
|
||||
* logic in VersionUtils.java, throwing out alphas because they don't have any
|
||||
* backwards compatibility guarantees and only keeping the latest beta or rc
|
||||
* in a branch if there are only betas and rcs in the branch so we have
|
||||
* *something* to test against. */
|
||||
Version currentVersion = Version.fromString(VersionProperties.elasticsearch.minus('-SNAPSHOT'))
|
||||
int prevMajor = currentVersion.major - 1
|
||||
File versionFile = file('core/src/main/java/org/elasticsearch/Version.java')
|
||||
|
|
@ -84,11 +84,20 @@ for (String line : versionLines) {
|
|||
int major = Integer.parseInt(match.group(1))
|
||||
int minor = Integer.parseInt(match.group(2))
|
||||
int bugfix = Integer.parseInt(match.group(3))
|
||||
Version foundVersion = new Version(major, minor, bugfix, false)
|
||||
String suffix = (match.group(4) ?: '').replace('_', '-')
|
||||
Version foundVersion = new Version(major, minor, bugfix, suffix, false)
|
||||
if (currentVersion != foundVersion
|
||||
&& (major == prevMajor || major == currentVersion.major)
|
||||
&& (versions.isEmpty() || versions.last() != foundVersion)) {
|
||||
&& (major == prevMajor || major == currentVersion.major)) {
|
||||
if (versions.isEmpty() || versions.last() != foundVersion) {
|
||||
versions.add(foundVersion)
|
||||
} else {
|
||||
// Replace the earlier betas with later ones
|
||||
Version last = versions.set(versions.size() - 1, foundVersion)
|
||||
if (last.suffix == '') {
|
||||
throw new InvalidUserDataException("Found two equal versions but"
|
||||
+ " the first one [$last] wasn't a beta.")
|
||||
}
|
||||
}
|
||||
if (major == prevMajor && minor > lastPrevMinor) {
|
||||
prevMinorIndex = versions.size() - 1
|
||||
lastPrevMinor = minor
|
||||
|
|
@ -106,10 +115,10 @@ if (currentVersion.bugfix == 0) {
|
|||
// unreleased version of closest branch. So for those cases, the version includes -SNAPSHOT,
|
||||
// and the bwc distribution will checkout and build that version.
|
||||
Version last = versions[-1]
|
||||
versions[-1] = new Version(last.major, last.minor, last.bugfix, true)
|
||||
versions[-1] = new Version(last.major, last.minor, last.bugfix, last.suffix, true)
|
||||
if (last.bugfix == 0) {
|
||||
versions[-2] = new Version(
|
||||
versions[-2].major, versions[-2].minor, versions[-2].bugfix, true)
|
||||
versions[-2].major, versions[-2].minor, versions[-2].bugfix, versions[-2].suffix, true)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,6 +20,8 @@
|
|||
package org.elasticsearch.gradle
|
||||
|
||||
import groovy.transform.Sortable
|
||||
import java.util.regex.Matcher
|
||||
import org.gradle.api.InvalidUserDataException
|
||||
|
||||
/**
|
||||
* Encapsulates comparison and printing logic for an x.y.z version.
|
||||
|
|
@ -32,32 +34,37 @@ public class Version {
|
|||
final int bugfix
|
||||
final int id
|
||||
final boolean snapshot
|
||||
/**
|
||||
* Suffix on the version name. Unlike Version.java the build does not
|
||||
* consider alphas and betas different versions, it just preserves the
|
||||
* suffix that the version was declared with in Version.java.
|
||||
*/
|
||||
final String suffix
|
||||
|
||||
public Version(int major, int minor, int bugfix, boolean snapshot) {
|
||||
public Version(int major, int minor, int bugfix,
|
||||
String suffix, boolean snapshot) {
|
||||
this.major = major
|
||||
this.minor = minor
|
||||
this.bugfix = bugfix
|
||||
this.snapshot = snapshot
|
||||
this.suffix = suffix
|
||||
this.id = major * 100000 + minor * 1000 + bugfix * 10 +
|
||||
(snapshot ? 1 : 0)
|
||||
}
|
||||
|
||||
public static Version fromString(String s) {
|
||||
String[] parts = s.split('\\.')
|
||||
String bugfix = parts[2]
|
||||
boolean snapshot = false
|
||||
if (bugfix.contains('-')) {
|
||||
snapshot = bugfix.endsWith('-SNAPSHOT')
|
||||
bugfix = bugfix.split('-')[0]
|
||||
Matcher m = s =~ /(\d+)\.(\d+)\.(\d+)(-alpha\d+|-beta\d+|-rc\d+)?(-SNAPSHOT)?/
|
||||
if (m.matches() == false) {
|
||||
throw new InvalidUserDataException("Invalid version [${s}]")
|
||||
}
|
||||
return new Version(parts[0] as int, parts[1] as int, bugfix as int,
|
||||
snapshot)
|
||||
return new Version(m.group(1) as int, m.group(2) as int,
|
||||
m.group(3) as int, m.group(4) ?: '', m.group(5) != null)
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
String snapshotStr = snapshot ? '-SNAPSHOT' : ''
|
||||
return "${major}.${minor}.${bugfix}${snapshotStr}"
|
||||
return "${major}.${minor}.${bugfix}${suffix}${snapshotStr}"
|
||||
}
|
||||
|
||||
public boolean before(String compareTo) {
|
||||
|
|
|
|||
|
|
@ -119,6 +119,14 @@ if (enabled) {
|
|||
dependsOn checkoutBwcBranch
|
||||
dir = checkoutDir
|
||||
tasks = [':distribution:deb:assemble', ':distribution:rpm:assemble', ':distribution:zip:assemble']
|
||||
doLast {
|
||||
List missing = [bwcDeb, bwcRpm, bwcZip].grep { file ->
|
||||
false == file.exists() }
|
||||
if (false == missing.empty) {
|
||||
throw new InvalidUserDataException(
|
||||
"Building bwc version didn't generate expected files ${missing}")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -181,11 +181,15 @@ public class VersionUtilsTests extends ESTestCase {
|
|||
// First check the index compatible versions
|
||||
VersionsFromProperty indexCompatible = new VersionsFromProperty("tests.gradle_index_compat_versions");
|
||||
List<Version> released = VersionUtils.allReleasedVersions().stream()
|
||||
/* We skip alphas, betas, and the like in gradle because they don't have
|
||||
* backwards compatibility guarantees even though they are technically
|
||||
* released. */
|
||||
.filter(v -> v.isRelease() && (v.major == Version.CURRENT.major || v.major == Version.CURRENT.major - 1))
|
||||
// Java lists some non-index compatible versions but gradle does not include them.
|
||||
.filter(v -> v.major == Version.CURRENT.major || v.major == Version.CURRENT.major - 1)
|
||||
/* Gradle will never include *released* alphas or betas because it will prefer
|
||||
* the unreleased branch head. Gradle is willing to use branch heads that are
|
||||
* beta or rc so that we have *something* to test against even though we
|
||||
* do not offer backwards compatibility for alphas, betas, or rcs. */
|
||||
.filter(Version::isRelease)
|
||||
.collect(toList());
|
||||
|
||||
List<String> releasedIndexCompatible = released.stream()
|
||||
.map(Object::toString)
|
||||
.collect(toList());
|
||||
|
|
@ -195,7 +199,15 @@ public class VersionUtilsTests extends ESTestCase {
|
|||
/* Gradle skips the current version because being backwards compatible
|
||||
* with yourself is implied. Java lists the version because it is useful. */
|
||||
.filter(v -> v != Version.CURRENT)
|
||||
.map(v -> v.major + "." + v.minor + "." + v.revision)
|
||||
/* Note that gradle skips alphas because they don't have any backwards
|
||||
* compatibility guarantees but keeps the last beta and rc in a branch
|
||||
* on when there are only betas an RCs in that branch so that we have
|
||||
* *something* to test that branch against. There is no need to recreate
|
||||
* that logic here because allUnreleasedVersions already only contains
|
||||
* the heads of branches so it should be good enough to just keep all
|
||||
* the non-alphas.*/
|
||||
.filter(v -> false == v.isAlpha())
|
||||
.map(Object::toString)
|
||||
.collect(toCollection(LinkedHashSet::new)));
|
||||
assertEquals(unreleasedIndexCompatible, indexCompatible.unreleased);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue