Addressed Lance's comments

Author: taimurhafeez

tests/e2e/framework/common.go

@@ -2175,6 +2175,7 @@ func (f *Framework) AssertHasCheck(suiteName, scanName string, check compv1alpha
 
 	return nil
 }
+
 func (f *Framework) AssertHasRemediations(suiteName, scanName, roleLabel string, remNameList []string) error {
 	var scanSuiteMapNames = make(map[string]bool)
 	var scanSuiteRemediations []compv1alpha1.ComplianceRemediation

tests/e2e/parallel/main_test.go

@@ -913,9 +913,9 @@ func TestScanProducesRemediationsAndLabels(t *testing.T) {
 			Namespace: f.OperatorNamespace,
 		},
 		Spec: compv1alpha1.TailoredProfileSpec{
-			Title:       "TestScanProducesRemediationsAndLabels",
-			Description: "TestScanProducesRemediationsAndLabels",
-			Extends:     "ocp4-moderate",
+			Title:       t.Name(),
+			Description: t.Name(),
+			Extends:     "ocp4-e8",
 		},
 	}
 
@@ -981,18 +981,31 @@ func TestScanProducesRemediationsAndLabels(t *testing.T) {
 	if len(checkList.Items) == 0 {
 		t.Fatal("expected at least one check result")
 	}
-	// Use the first check to verify labels are working correctly
-	firstCheck := checkList.Items[0]
-	// Verify all required labels are present
-	labelsToVerify := []string{
-		compv1alpha1.SuiteLabel,
-		compv1alpha1.ComplianceScanLabel,
+	// Expected scan name is binding name + profile name
+	expectedScanName := bindingName + "-" + tpName
+	// Verify all required labels are present on every check result
+	// For some labels we can verify the exact value
+	labelsWithValues := map[string]string{
+		compv1alpha1.SuiteLabel:          bindingName,
+		compv1alpha1.ComplianceScanLabel: expectedScanName,
+	}
+	// For other labels we just verify they are present (non-empty)
+	labelsPresenceOnly := []string{
 		compv1alpha1.ComplianceCheckResultSeverityLabel,
 		compv1alpha1.ComplianceCheckResultStatusLabel,
 	}
-	for _, label := range labelsToVerify {
-		if firstCheck.Labels[label] == "" {
-			t.Fatalf("check %s is missing label %s", firstCheck.Name, label)
+	for _, check := range checkList.Items {
+		// Check labels with specific expected values
+		for label, expected := range labelsWithValues {
+			if check.Labels[label] != expected {
+				t.Fatalf("check %s label %s: got %q, want %q", check.Name, label, check.Labels[label], expected)
+			}
+		}
+		// Check labels that must be present (non-empty)
+		for _, label := range labelsPresenceOnly {
+			if check.Labels[label] == "" {
+				t.Fatalf("check %s is missing label %s", check.Name, label)
+			}
 		}
 	}
 }