Merge pull request #28148 from soltysh/ocpbugs-16166

OCPBUGS-16166: disable 2 tests in preparation to land k8s 1.27.4

Author: openshift-merge-robot

pkg/test/ginkgo/test_suite.go

@@ -2,6 +2,7 @@ package ginkgo
 
 import (
 	"regexp"
+	"strings"
 	"time"
 
 	"github.com/onsi/ginkgo/v2"
@@ -33,6 +34,9 @@ func testsForSuite() ([]*testCase, error) {
 		if append, ok := k8sgenerated.Annotations[name]; ok {
 			spec.AppendText(append)
 		}
+		if append := extras(name); len(append) > 0 {
+			spec.AppendText(append)
+		}
 		tc, err := newTestCaseFromGinkgoSpec(spec)
 		if err != nil {
 			errs = append(errs, err)
@@ -45,6 +49,15 @@ func testsForSuite() ([]*testCase, error) {
 	return tests, nil
 }
 
+func extras(name string) string {
+	// https://issues.redhat.com/browse/OCPBUGS-16166
+	if strings.Contains(name, "[Feature:StatefulSetStartOrdinal]") ||
+		strings.Contains(name, "Daemon set [Serial] should rollback without unnecessary restarts") {
+		return " [Disabled:Broken]"
+	}
+	return ""
+}
+
 var re = regexp.MustCompile(`.*\[Timeout:(.[^\]]*)\]`)
 
 func newTestCaseFromGinkgoSpec(spec types.TestSpec) (*testCase, error) {