From be597d84c40b0a0e687cb90c3e5f81c5ecfe6118 Mon Sep 17 00:00:00 2001
From: mblos <marcel.gute@sap.com>
Date: Wed, 25 Mar 2026 15:48:36 +0100
Subject: [PATCH] fix test flakiness

---
 .../api_change_commitments_test.go            | 36 ++++++++++++++++---
 .../reservations/commitments/syncer_test.go   | 13 +++++--
 2 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/internal/scheduling/reservations/commitments/api_change_commitments_test.go b/internal/scheduling/reservations/commitments/api_change_commitments_test.go
index 6fd5c17f0..c304d9e5a 100644
--- a/internal/scheduling/reservations/commitments/api_change_commitments_test.go
+++ b/internal/scheduling/reservations/commitments/api_change_commitments_test.go
@@ -615,8 +615,16 @@ func (tfg TestFlavorGroup) ToFlavorGroupsKnowledge() FlavorGroupsKnowledge {
 		groupMap[groupName] = append(groupMap[groupName], flavor)
 	}
 
+	// Sort group names for deterministic iteration
+	sortedGroupNames := make([]string, 0, len(groupMap))
+	for groupName := range groupMap {
+		sortedGroupNames = append(sortedGroupNames, groupName)
+	}
+	sort.Strings(sortedGroupNames)
+
 	var groups []compute.FlavorGroupFeature
-	for groupName, groupFlavors := range groupMap {
+	for _, groupName := range sortedGroupNames {
+		groupFlavors := groupMap[groupName]
 		if len(groupFlavors) == 0 {
 			continue
 		}
@@ -1765,6 +1773,7 @@ func newAPIResponse(rejectReasonSubstrings ...string) APIResponseExpectation {
 
 // buildRequestJSON converts a test CommitmentChangeRequest to JSON string.
 // Builds the nested JSON structure directly for simplicity.
+// Uses sorted iteration to ensure deterministic JSON output.
 func buildRequestJSON(req CommitmentChangeRequest) string {
 	// Group commitments by project and resource for nested structure
 	type projectResources map[liquid.ResourceName][]TestCommitment
@@ -1780,11 +1789,30 @@ func buildRequestJSON(req CommitmentChangeRequest) string {
 		)
 	}
 
-	// Build nested JSON structure
+	// Sort projects for deterministic iteration
+	sortedProjects := make([]string, 0, len(byProject))
+	for projectID := range byProject {
+		sortedProjects = append(sortedProjects, projectID)
+	}
+	sort.Strings(sortedProjects)
+
+	// Build nested JSON structure with sorted iteration
 	var projectParts []string
-	for projectID, resources := range byProject {
+	for _, projectID := range sortedProjects {
+		resources := byProject[projectID]
+
+		// Sort resource names for deterministic iteration
+		sortedResources := make([]liquid.ResourceName, 0, len(resources))
+		for resourceName := range resources {
+			sortedResources = append(sortedResources, resourceName)
+		}
+		sort.Slice(sortedResources, func(i, j int) bool {
+			return string(sortedResources[i]) < string(sortedResources[j])
+		})
+
 		var resourceParts []string
-		for resourceName, commits := range resources {
+		for _, resourceName := range sortedResources {
+			commits := resources[resourceName]
 			var commitParts []string
 			for _, c := range commits {
 				expiryTime := time.Now().Add(time.Duration(defaultCommitmentExpiryYears) * 365 * 24 * time.Hour)
diff --git a/internal/scheduling/reservations/commitments/syncer_test.go b/internal/scheduling/reservations/commitments/syncer_test.go
index ef773e676..b09115453 100644
--- a/internal/scheduling/reservations/commitments/syncer_test.go
+++ b/internal/scheduling/reservations/commitments/syncer_test.go
@@ -5,6 +5,7 @@ package commitments
 
 import (
 	"context"
+	"sort"
 	"testing"
 
 	"github.com/cobaltcore-dev/cortex/api/v1alpha1"
@@ -32,9 +33,17 @@ type FlavorGroupData struct {
 func createFlavorGroupKnowledge(t *testing.T, groups map[string]FlavorGroupData) *v1alpha1.Knowledge {
 	t.Helper()
 
-	// Build flavor group features
+	// Sort group names for deterministic iteration
+	sortedGroupNames := make([]string, 0, len(groups))
+	for groupName := range groups {
+		sortedGroupNames = append(sortedGroupNames, groupName)
+	}
+	sort.Strings(sortedGroupNames)
+
+	// Build flavor group features with sorted iteration
 	features := make([]compute.FlavorGroupFeature, 0, len(groups))
-	for groupName, data := range groups {
+	for _, groupName := range sortedGroupNames {
+		data := groups[groupName]
 		features = append(features, compute.FlavorGroupFeature{
 			Name: groupName,
 			Flavors: []compute.FlavorInGroup{