Sort build scans by job run

Author: yrodiere

src/main/java/org/hibernate/infra/bot/ExtractDevelocityBuildScans.java

@@ -9,6 +9,7 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
+import com.gradle.develocity.model.BuildAttributesEnvironment;
 import jakarta.inject.Inject;
 
 import org.hibernate.infra.bot.config.DeploymentConfig;
@@ -161,6 +162,7 @@ private boolean isJenkinsBuild(GHCheckRun checkRun) {
 
 	private DevelocityCIBuildScan toCIBuildScan(Build build) {
 		URI buildScanURI = deploymentConfig.develocity().uri().resolve( "/s/" + build.getId() );
+		BuildAttributesEnvironment environment;
 		List<BuildAttributesValue> customValues;
 		List<BuildAttributesLink> links;
 		List<String> tags;
@@ -171,6 +173,7 @@ private DevelocityCIBuildScan toCIBuildScan(Build build) {
 		var gradle = build.getModels().getGradleAttributes();
 		if ( maven != null && maven.getModel() != null ) {
 			var model = maven.getModel();
+			environment = model.getEnvironment();
 			tags = model.getTags();
 			customValues = model.getValues();
 			links = model.getLinks();
@@ -180,6 +183,7 @@ private DevelocityCIBuildScan toCIBuildScan(Build build) {
 		}
 		else if ( gradle != null && gradle.getModel() != null ) {
 			var model = gradle.getModel();
+			environment = model.getEnvironment();
 			tags = model.getTags();
 			customValues = model.getValues();
 			links = model.getLinks();
@@ -191,6 +195,7 @@ else if ( gradle != null && gradle.getModel() != null ) {
 			throw new IllegalStateException( "No Maven or Gradle model in build scan " + buildScanURI );
 		}
 		String provider = "";
+		String hostname = environment.getPublicHostname();
 		String jobOrWorkflow = "";
 		String stage = "";
 		for ( BuildAttributesValue customValue : customValues ) {
@@ -218,7 +223,7 @@ else if ( customValue.getName().equals( "CI stage" ) ) {
 				.sorted()
 				.toList();
 		return new DevelocityCIBuildScan(
-				provider,
+				provider, hostname,
 				jobOrWorkflow,
 				jobOrWorkflowUri,
 				stage,

src/main/java/org/hibernate/infra/bot/develocity/DevelocityCIBuildScan.java

@@ -4,15 +4,19 @@
 import java.util.Comparator;
 import java.util.List;
 
-public record DevelocityCIBuildScan(String provider, String jobOrWorkflow, URI jobOrWorkflowUri, String stage,
+public record DevelocityCIBuildScan(String provider, String hostname,
+									String jobOrWorkflow, URI jobOrWorkflowUri, String stage,
 									Long availableAt, List<String> tags, List<String> goals,
 									Status status, Status testStatus,
 									URI buildScanUri, URI failuresUri, URI testsUri, URI logsUri) {
 
 	public static final Comparator<? super DevelocityCIBuildScan> COMPARATOR =
 			Comparator.comparing( DevelocityCIBuildScan::provider )
 					.thenComparing( DevelocityCIBuildScan::jobOrWorkflow )
-					.thenComparing( DevelocityCIBuildScan::stage )
+					// Ideally we'd sort by "job run ID", but we don't have that information.
+					// Since each host only runs one job at any given time,
+					// we approximate it by sorting by hostname then date.
+					.thenComparing( DevelocityCIBuildScan::hostname )
 					.thenComparing( DevelocityCIBuildScan::availableAt );
 
 	public enum Status {

src/test/java/org/hibernate/infra/bot/develocity/DevelocityReportFormatterTest.java

@@ -244,7 +244,7 @@ void summary_tagsConfig() {
 
 	private DevelocityCIBuildScan buildScanStub(String provider, String jobOrWorkflow, String stage, List<String> tags,
 			List<String> goals, DevelocityCIBuildScan.Status status, DevelocityCIBuildScan.Status testStatus) {
-		return new DevelocityCIBuildScan( provider, jobOrWorkflow,
+		return new DevelocityCIBuildScan( provider, "hostname does not matter (not rendered)", jobOrWorkflow,
 				URI.create( "https://ci.hibernate.org/job/hibernate-search/job/PR-4125/4/" ),
 				stage, 0L,
 				tags, goals, status, testStatus,