Skip to content

Fix build.snapshot bug in version collection #28641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2018
Merged

Fix build.snapshot bug in version collection #28641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions buildSrc/src/main/groovy/org/elasticsearch/gradle/VersionCollection.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,7 @@ class VersionCollection {
'next-bugfix-snapshot',
'maintenance-bugfix-snapshot']



// When we roll 8.0 its very likely these will need to be extracted from this class
private final boolean buildSnapshot = System.getProperty("build.snapshot", "true") == "true"
private final boolean isReleasableBranch = true

/**
Expand All @@ -76,6 +73,7 @@ class VersionCollection {
* @param versionLines The lines of the Version.java file.
*/
VersionCollection(List<String> versionLines) {
final boolean buildSnapshot = System.getProperty("build.snapshot", "true") == "true"

List<Version> versions = []
// This class should be converted wholesale to use the treeset
Expand Down Expand Up @@ -303,7 +301,7 @@ class VersionCollection {
*/
private Version replaceAsSnapshot(Version version) {
versionSet.remove(version)
Version snapshotVersion = new Version(version.major, version.minor, version.revision, version.suffix, buildSnapshot)
Version snapshotVersion = new Version(version.major, version.minor, version.revision, version.suffix, true)
safeAddToSet(snapshotVersion)
return snapshotVersion
}
Expand Down
4 changes: 0 additions & 4 deletions test/framework/src/main/java/org/elasticsearch/test/VersionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ public class VersionUtils {
static Tuple<List<Version>, List<Version>> resolveReleasedVersions(Version current, Class<?> versionClass) {
List<Version> versions = Version.getDeclaredVersions(versionClass);

if (!Booleans.parseBoolean(System.getProperty("build.snapshot", "true"))) {
return Tuple.tuple(versions, Collections.emptyList());
}

Version last = versions.remove(versions.size() - 1);
assert last.equals(current) : "The highest version must be the current one "
+ "but was [" + versions.get(versions.size() - 1) + "] and current was [" + current + "]";
Expand Down
239 changes: 66 additions & 173 deletions test/framework/src/test/java/org/elasticsearch/test/VersionUtilsTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,27 +119,12 @@ public void testResolveReleasedVersionsForReleaseBranch() {
List<Version> released = t.v1();
List<Version> unreleased = t.v2();

final List<Version> expectedReleased;
final List<Version> expectedUnreleased;
if (Booleans.parseBoolean(System.getProperty("build.snapshot", "true"))) {
expectedReleased = Arrays.asList(
TestReleaseBranch.V_5_3_0,
TestReleaseBranch.V_5_3_1,
TestReleaseBranch.V_5_3_2,
TestReleaseBranch.V_5_4_0);
expectedUnreleased = Collections.singletonList(TestReleaseBranch.V_5_4_1);
} else {
expectedReleased = Arrays.asList(
TestReleaseBranch.V_5_3_0,
TestReleaseBranch.V_5_3_1,
TestReleaseBranch.V_5_3_2,
TestReleaseBranch.V_5_4_0,
TestReleaseBranch.V_5_4_1);
expectedUnreleased = Collections.emptyList();
}

assertThat(released, equalTo(expectedReleased));
assertThat(unreleased, equalTo(expectedUnreleased));
assertThat(released, equalTo(Arrays.asList(
TestReleaseBranch.V_5_3_0,
TestReleaseBranch.V_5_3_1,
TestReleaseBranch.V_5_3_2,
TestReleaseBranch.V_5_4_0)));
assertThat(unreleased, equalTo(Collections.singletonList(TestReleaseBranch.V_5_4_1)));
}

public static class TestStableBranch {
Expand All @@ -155,19 +140,12 @@ public void testResolveReleasedVersionsForUnreleasedStableBranch() {
List<Version> released = t.v1();
List<Version> unreleased = t.v2();

final List<Version> expectedReleased;
final List<Version> expectedUnreleased;
if (Booleans.parseBoolean(System.getProperty("build.snapshot", "true"))) {
expectedReleased = Arrays.asList(TestStableBranch.V_5_3_0, TestStableBranch.V_5_3_1);
expectedUnreleased = Arrays.asList(TestStableBranch.V_5_3_2, TestStableBranch.V_5_4_0);
} else {
expectedReleased =
Arrays.asList(TestStableBranch.V_5_3_0, TestStableBranch.V_5_3_1, TestStableBranch.V_5_3_2, TestStableBranch.V_5_4_0);
expectedUnreleased = Collections.emptyList();
}

assertThat(released, equalTo(expectedReleased));
assertThat(unreleased, equalTo(expectedUnreleased));
assertThat(released, equalTo(Arrays.asList(
TestStableBranch.V_5_3_0,
TestStableBranch.V_5_3_1)));
assertThat(unreleased, equalTo(Arrays.asList(
TestStableBranch.V_5_3_2,
TestStableBranch.V_5_4_0)));
}

public static class TestStableBranchBehindStableBranch {
Expand All @@ -184,25 +162,13 @@ public void testResolveReleasedVersionsForStableBranchBehindStableBranch() {
List<Version> released = t.v1();
List<Version> unreleased = t.v2();

final List<Version> expectedReleased;
final List<Version> expectedUnreleased;
if (Booleans.parseBoolean(System.getProperty("build.snapshot", "true"))) {
expectedReleased = Arrays.asList(TestStableBranchBehindStableBranch.V_5_3_0, TestStableBranchBehindStableBranch.V_5_3_1);
expectedUnreleased = Arrays.asList(
TestStableBranchBehindStableBranch.V_5_3_2,
TestStableBranchBehindStableBranch.V_5_4_0,
TestStableBranchBehindStableBranch.V_5_5_0);
} else {
expectedReleased = Arrays.asList(
TestStableBranchBehindStableBranch.V_5_3_0,
TestStableBranchBehindStableBranch.V_5_3_1,
TestStableBranchBehindStableBranch.V_5_3_2,
TestStableBranchBehindStableBranch.V_5_4_0,
TestStableBranchBehindStableBranch.V_5_5_0);
expectedUnreleased = Collections.emptyList();
}
assertThat(released, equalTo(expectedReleased));
assertThat(unreleased, equalTo(expectedUnreleased));
assertThat(released, equalTo(Arrays.asList(
TestStableBranchBehindStableBranch.V_5_3_0,
TestStableBranchBehindStableBranch.V_5_3_1)));
assertThat(unreleased, equalTo(Arrays.asList(
TestStableBranchBehindStableBranch.V_5_3_2,
TestStableBranchBehindStableBranch.V_5_4_0,
TestStableBranchBehindStableBranch.V_5_5_0)));
}

public static class TestUnstableBranch {
Expand All @@ -222,28 +188,15 @@ public void testResolveReleasedVersionsForUnstableBranch() {
List<Version> released = t.v1();
List<Version> unreleased = t.v2();

final List<Version> expectedReleased;
final List<Version> expectedUnreleased;
if (Booleans.parseBoolean(System.getProperty("build.snapshot", "true"))) {
expectedReleased = Arrays.asList(
TestUnstableBranch.V_5_3_0,
TestUnstableBranch.V_5_3_1,
TestUnstableBranch.V_6_0_0_alpha1,
TestUnstableBranch.V_6_0_0_alpha2);
expectedUnreleased = Arrays.asList(TestUnstableBranch.V_5_3_2, TestUnstableBranch.V_5_4_0, TestUnstableBranch.V_6_0_0_beta1);
} else {
expectedReleased = Arrays.asList(
TestUnstableBranch.V_5_3_0,
TestUnstableBranch.V_5_3_1,
TestUnstableBranch.V_5_3_2,
TestUnstableBranch.V_5_4_0,
TestUnstableBranch.V_6_0_0_alpha1,
TestUnstableBranch.V_6_0_0_alpha2,
TestUnstableBranch.V_6_0_0_beta1);
expectedUnreleased = Collections.emptyList();
}
assertThat(released, equalTo(expectedReleased));
assertThat(unreleased, equalTo(expectedUnreleased));
assertThat(released, equalTo(Arrays.asList(
TestUnstableBranch.V_5_3_0,
TestUnstableBranch.V_5_3_1,
TestUnstableBranch.V_6_0_0_alpha1,
TestUnstableBranch.V_6_0_0_alpha2)));
assertThat(unreleased, equalTo(Arrays.asList(
TestUnstableBranch.V_5_3_2,
TestUnstableBranch.V_5_4_0,
TestUnstableBranch.V_6_0_0_beta1)));
}

public static class TestNewMajorRelease {
Expand All @@ -265,35 +218,17 @@ public void testResolveReleasedVersionsAtNewMajorRelease() {
List<Version> released = t.v1();
List<Version> unreleased = t.v2();

final List<Version> expectedReleased;
final List<Version> expectedUnreleased;
if (Booleans.parseBoolean(System.getProperty("build.snapshot", "true"))) {
expectedReleased = Arrays.asList(
TestNewMajorRelease.V_5_6_0,
TestNewMajorRelease.V_5_6_1,
TestNewMajorRelease.V_5_6_2,
TestNewMajorRelease.V_6_0_0_alpha1,
TestNewMajorRelease.V_6_0_0_alpha2,
TestNewMajorRelease.V_6_0_0_beta1,
TestNewMajorRelease.V_6_0_0_beta2,
TestNewMajorRelease.V_6_0_0);
expectedUnreleased = Arrays.asList(TestNewMajorRelease.V_6_0_1);
} else {
expectedReleased = Arrays.asList(
TestNewMajorRelease.V_5_6_0,
TestNewMajorRelease.V_5_6_1,
TestNewMajorRelease.V_5_6_2,
TestNewMajorRelease.V_6_0_0_alpha1,
TestNewMajorRelease.V_6_0_0_alpha2,
TestNewMajorRelease.V_6_0_0_beta1,
TestNewMajorRelease.V_6_0_0_beta2,
TestNewMajorRelease.V_6_0_0,
TestNewMajorRelease.V_6_0_1);
expectedUnreleased = Collections.emptyList();
}

assertThat(released, equalTo(expectedReleased));
assertThat(unreleased, equalTo(expectedUnreleased));
assertThat(released, equalTo(Arrays.asList(
TestNewMajorRelease.V_5_6_0,
TestNewMajorRelease.V_5_6_1,
TestNewMajorRelease.V_5_6_2,
TestNewMajorRelease.V_6_0_0_alpha1,
TestNewMajorRelease.V_6_0_0_alpha2,
TestNewMajorRelease.V_6_0_0_beta1,
TestNewMajorRelease.V_6_0_0_beta2,
TestNewMajorRelease.V_6_0_0)));
assertThat(unreleased, equalTo(Arrays.asList(
TestNewMajorRelease.V_6_0_1)));
}

public static class TestVersionBumpIn6x {
Expand All @@ -316,37 +251,18 @@ public void testResolveReleasedVersionsAtVersionBumpIn6x() {
List<Version> released = t.v1();
List<Version> unreleased = t.v2();

final List<Version> expectedReleased;
final List<Version> expectedUnreleased;

if (Booleans.parseBoolean(System.getProperty("build.snapshot", "true"))) {
expectedReleased = 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,
TestVersionBumpIn6x.V_6_0_0_beta2,
TestVersionBumpIn6x.V_6_0_0);
expectedUnreleased = Arrays.asList(TestVersionBumpIn6x.V_6_0_1, TestVersionBumpIn6x.V_6_1_0);
} else {
expectedReleased = 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,
TestVersionBumpIn6x.V_6_0_0_beta2,
TestVersionBumpIn6x.V_6_0_0,
TestVersionBumpIn6x.V_6_0_1,
TestVersionBumpIn6x.V_6_1_0);
expectedUnreleased = Collections.emptyList();
}

assertThat(released, equalTo(expectedReleased));
assertThat(unreleased, equalTo(expectedUnreleased));
assertThat(released, equalTo(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,
TestVersionBumpIn6x.V_6_0_0_beta2,
TestVersionBumpIn6x.V_6_0_0)));
assertThat(unreleased, equalTo(Arrays.asList(
TestVersionBumpIn6x.V_6_0_1,
TestVersionBumpIn6x.V_6_1_0)));
}

public static class TestNewMinorBranchIn6x {
Expand All @@ -372,44 +288,21 @@ public void testResolveReleasedVersionsAtNewMinorBranchIn6x() {
List<Version> released = t.v1();
List<Version> unreleased = t.v2();

final List<Version> expectedReleased;
final List<Version> expectedUnreleased;
if (Booleans.parseBoolean(System.getProperty("build.snapshot", "true"))) {
expectedReleased = 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,
TestNewMinorBranchIn6x.V_6_0_0_beta2,
TestNewMinorBranchIn6x.V_6_0_0,
TestNewMinorBranchIn6x.V_6_0_1,
TestNewMinorBranchIn6x.V_6_1_0,
TestNewMinorBranchIn6x.V_6_1_1);
expectedUnreleased = Arrays.asList(
TestNewMinorBranchIn6x.V_6_1_2,
TestNewMinorBranchIn6x.V_6_2_0);
} else {
expectedReleased = 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,
TestNewMinorBranchIn6x.V_6_0_0_beta2,
TestNewMinorBranchIn6x.V_6_0_0,
TestNewMinorBranchIn6x.V_6_0_1,
TestNewMinorBranchIn6x.V_6_1_0,
TestNewMinorBranchIn6x.V_6_1_1,
TestNewMinorBranchIn6x.V_6_1_2,
TestNewMinorBranchIn6x.V_6_2_0);
expectedUnreleased = Collections.emptyList();
}

assertThat(released, equalTo(expectedReleased));
assertThat(unreleased, equalTo(expectedUnreleased));
assertThat(released, equalTo(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,
TestNewMinorBranchIn6x.V_6_0_0_beta2,
TestNewMinorBranchIn6x.V_6_0_0,
TestNewMinorBranchIn6x.V_6_0_1,
TestNewMinorBranchIn6x.V_6_1_0,
TestNewMinorBranchIn6x.V_6_1_1)));
assertThat(unreleased, equalTo(Arrays.asList(
TestNewMinorBranchIn6x.V_6_1_2,
TestNewMinorBranchIn6x.V_6_2_0)));
}

/**
Expand Down