Fix label issue in operator group e2e test

Signed-off-by: perdasilva <[email protected]>

Author: perdasilva

test/e2e/gc_e2e_test.go

@@ -646,7 +646,7 @@ var _ = Describe("Garbage collection for dependent resources", func() {
 				}).Should(BeNil())
 			})
 
-			// issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/2626
+			// flake issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/2626
 			It("[FLAKY] should have removed the old configmap and put the new configmap in place", func() {
 				Eventually(func() bool {
 					_, err := kubeClient.GetConfigMap(testNamespace, configmapName)

test/e2e/operator_groups_e2e_test.go

@@ -1899,7 +1899,7 @@ var _ = Describe("Operator Group", func() {
 		aCSV := newCSV(csvName, opGroupNamespace, "", semver.MustParse("0.0.0"), []apiextensions.CustomResourceDefinition{mainCRD}, nil, &namedStrategy)
 
 		// Use the It spec name as label after stripping whitespaces
-		aCSV.Labels = map[string]string{"label": strings.Replace(CurrentGinkgoTestDescription().TestText, " ", "", -1)}
+		aCSV.Labels = map[string]string{"label": RemoveNonAlphanumericCharacters(CurrentGinkgoTestDescription().TestText)}
 		createdCSV, err := crc.OperatorsV1alpha1().ClusterServiceVersions(opGroupNamespace).Create(context.TODO(), &aCSV, metav1.CreateOptions{})
 		require.NoError(GinkgoT(), err)
 

test/e2e/operator_test.go

@@ -70,7 +70,8 @@ var _ = Describe("Operator API", func() {
 	// 14. Ensure the reference to ns-a is eventually removed from o's status.components.refs field
 	// 15. Delete o
 	// 16. Ensure o is not re-created
-	It("should surface components in its status", func() {
+	// issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/2628
+	It("[FLAKY] should surface components in its status", func() {
 		o := &operatorsv1.Operator{}
 		o.SetName(genName("o-"))
 

test/e2e/util.go

@@ -1030,3 +1030,27 @@ func inKind(client operatorclient.ClientInterface) (bool, error) {
 	}
 	return false, nil
 }
+
+// RemoveNonAlphanumericCharacters removes all non-alphanumeric runes from a slice
+func RemoveNonAlphanumericCharacters(in string) string {
+	return filterSlice(in, alphanumericFilter)
+}
+
+// filterSlice removes characters from a slice using the protocol set by the filterFn
+func filterSlice(in string, filterFn func(int, int, rune) bool) string {
+	var stringBuilder strings.Builder
+	for pos, char := range in {
+		mustFilter := filterFn(pos, len(in), char)
+		if mustFilter {
+			stringBuilder.WriteRune(char)
+		}
+		fmt.Printf("%c (%d) %d/%d %t\n", char, char, pos, len(in), mustFilter)
+	}
+	return stringBuilder.String()
+}
+
+// alphanumericFilter returns true is the character is alphaNumeric
+func alphanumericFilter(index int, length int, char rune) bool {
+	isAlphaNumeric := (char >= 48 && char <= 57) || (char >= 65 && char <= 90) || (char >= 97 && char <= 122)
+	return isAlphaNumeric
+}

test/e2e/webhook_e2e_test.go

@@ -434,7 +434,8 @@ var _ = Describe("CSVs with a Webhook", func() {
 				return false, nil
 			}).Should(BeTrue())
 		})
-		It("Is updated when the CAs expire", func() {
+		// issue: https://github.com/operator-framework/operator-lifecycle-manager/issues/2629
+		It("[FLAKY] Is updated when the CAs expire", func() {
 			sideEffect := admissionregistrationv1.SideEffectClassNone
 			webhook := operatorsv1alpha1.WebhookDescription{
 				GenerateName:            webhookName,