Skip to content

Update speculative build logic #2200

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 2 commits into from
Nov 14, 2025
+138 −2
Merged

Update speculative build logic #2200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04af1ee
fix speculative build logic
colleenmcginnis Nov 13, 2025
698541a
Check against minor.0 anchored version of product version
Mpdreamz Nov 14, 2025
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
3 changes: 3 additions & 0 deletions config/products.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ products:
fleet:
display: 'Fleet'
versioning: 'stack'
fleet-server:
display: 'Fleet Server'
versioning: 'stack'
heartbeat:
display: 'Heartbeat'
versioning: 'stack'
Expand Down
5 changes: 3 additions & 2 deletions src/Elastic.Documentation.Configuration/Assembler/AssemblyConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,10 +220,11 @@ public ContentSourceMatch Match(ILoggerFactory logFactory, string repository, st
{
logger.LogInformation("Current is not using versioned branches checking product info");
var productVersion = versioningSystem.Current;
var anchoredProductVersion = new SemVersion(productVersion.Major, productVersion.Minor, 0);
var previousMinorVersion = new SemVersion(productVersion.Major, Math.Max(productVersion.Minor - 1, 0), 0);
if (v >= productVersion)
if (v >= anchoredProductVersion)
{
logger.LogInformation("Speculative build {Branch} is gte product current '{ProductCurrent}'", branchOrTag, productVersion);
logger.LogInformation("Speculative build {Branch} is gte product current '{ProductCurrent}' anchored at {ProductAnchored}", branchOrTag, productVersion, anchoredProductVersion);
match = match with
{
Speculative = true
Expand Down
132 changes: 132 additions & 0 deletions tests/Elastic.Documentation.Configuration.Tests/AssemblyConfigurationMatchTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,4 +265,136 @@ public void CurrentVersionMatchAlsoSetsSpeculative()
result.Current.Should().Be(ContentSource.Current);
result.Speculative.Should().BeTrue();
}

[Theory]
[InlineData("9.0", "9.0.0")] // Matches anchored product version
[InlineData("9.1", "9.0.0")] // Greater than anchored product version
[InlineData("9.5", "9.0.0")] // Much greater than anchored product version
public void VersionBranchSpeculativeBuildWhenGreaterThanOrEqualToAnchoredProductVersion(string branch, string productVersion)
{
var repositories = new Dictionary<string, Repository>
{
["test-repo"] = CreateRepository(current: "main", next: "main", edge: "main")
};
var config = CreateConfiguration(repositories);
var versionParts = productVersion.Split('.');
var product = CreateProduct(new SemVersion(int.Parse(versionParts[0], null), int.Parse(versionParts[1], null), int.Parse(versionParts[2], null)));

var result = config.Match(LoggerFactory, "elastic/test-repo", branch, product);

result.Speculative.Should().BeTrue();
}

[Theory]
[InlineData("8.15", "9.0.0")] // Less than anchored product version
[InlineData("7.17", "9.0.0")] // Much less than anchored product version
[InlineData("8.0", "9.1.5")] // Less than anchored product version with patch
public void VersionBranchNoSpeculativeBuildWhenLessThanAnchoredProductVersionAndNotPreviousMinor(string branch, string productVersion)
{
var repositories = new Dictionary<string, Repository>
{
["test-repo"] = CreateRepository(current: "main", next: "main", edge: "main")
};
var config = CreateConfiguration(repositories);
var versionParts = productVersion.Split('.');
var product = CreateProduct(new SemVersion(int.Parse(versionParts[0], null), int.Parse(versionParts[1], null), int.Parse(versionParts[2], null)));

var result = config.Match(LoggerFactory, "elastic/test-repo", branch, product);

result.Speculative.Should().BeFalse();
}

[Theory]
[InlineData("9.1", "9.2.0")] // Previous minor version
[InlineData("8.14", "8.15.1")] // Previous minor version with patch
[InlineData("10.0", "10.1.0")] // Previous minor version at major boundary
public void VersionBranchSpeculativeBuildWhenMatchesPreviousMinorVersion(string branch, string productVersion)
{
var repositories = new Dictionary<string, Repository>
{
["test-repo"] = CreateRepository(current: "main", next: "main", edge: "main")
};
var config = CreateConfiguration(repositories);
var versionParts = productVersion.Split('.');
var product = CreateProduct(new SemVersion(int.Parse(versionParts[0], null), int.Parse(versionParts[1], null), int.Parse(versionParts[2], null)));

var result = config.Match(LoggerFactory, "elastic/test-repo", branch, product);

result.Speculative.Should().BeTrue();
}

[Fact]
public void VersionBranchNoSpeculativeBuildWhenProductVersioningSystemIsNull()
{
var repositories = new Dictionary<string, Repository>
{
["test-repo"] = CreateRepository(current: "main", next: "main", edge: "main")
};
var config = CreateConfiguration(repositories);
var product = new Product
{
Id = "test-product",
DisplayName = "Test Product",
VersioningSystem = null // No versioning system
};

var result = config.Match(LoggerFactory, "elastic/test-repo", "9.0", product);

result.Speculative.Should().BeFalse();
}

[Fact]
public void VersionBranchNoSpeculativeBuildWhenProductIsNull()
{
var repositories = new Dictionary<string, Repository>
{
["test-repo"] = CreateRepository(current: "main", next: "main", edge: "main")
};
var config = CreateConfiguration(repositories);

var result = config.Match(LoggerFactory, "elastic/test-repo", "9.0", null);

result.Speculative.Should().BeFalse();
}

[Theory]
[InlineData("9.0", "9.0.15")] // Anchored version equals major.minor.0
[InlineData("9.0", "9.0.0")] // Anchored version equals major.minor.0
[InlineData("9.0", "9.0.1")] // Anchored version equals major.minor.0
public void VersionBranchAnchorsProductVersionToMinorZero(string branch, string productVersion)
{
var repositories = new Dictionary<string, Repository>
{
["test-repo"] = CreateRepository(current: "main", next: "main", edge: "main")
};
var config = CreateConfiguration(repositories);
var versionParts = productVersion.Split('.');
var product = CreateProduct(new SemVersion(int.Parse(versionParts[0], null), int.Parse(versionParts[1], null), int.Parse(versionParts[2], null)));

var result = config.Match(LoggerFactory, "elastic/test-repo", branch, product);

// Should match because branch 9.0 >= anchored product version 9.0.0
result.Speculative.Should().BeTrue();
}

[Theory]
[InlineData("8.0", "8.1.0")] // Previous minor when current is 8.1
[InlineData("7.17", "8.0.0")] // Previous minor when current is 8.0 (floor at 0)
public void VersionBranchPreviousMinorCalculationHandlesEdgeCases(string branch, string productVersion)
{
var repositories = new Dictionary<string, Repository>
{
["test-repo"] = CreateRepository(current: "main", next: "main", edge: "main")
};
var config = CreateConfiguration(repositories);
var versionParts = productVersion.Split('.');
var product = CreateProduct(new SemVersion(int.Parse(versionParts[0], null), int.Parse(versionParts[1], null), int.Parse(versionParts[2], null)));

var result = config.Match(LoggerFactory, "elastic/test-repo", branch, product);

// 8.0 should match previous minor of 8.1 (which is 8.0)
// 7.17 should NOT match previous minor of 8.0 (which is Math.Max(0-1, 0) = 8.0, not 7.17)
var expectedSpeculative = branch == "8.0" && productVersion == "8.1.0";
result.Speculative.Should().Be(expectedSpeculative);
}
}
Loading