Merge pull request #30337 from jsafrane/revert-annotations

OCPBUGS-62701: Revert TRT-1854: remove upstream annotation framework

Author: openshift-merge-bot[bot]

pkg/test/extensions/binary.go

@@ -27,6 +27,8 @@ import (
 	"k8s.io/klog/v2"
 	k8simage "k8s.io/kubernetes/test/utils/image"
 
+	k8sgenerated "k8s.io/kubernetes/openshift-hack/e2e/annotate/generated"
+
 	"github.com/openshift/origin/pkg/clioptions/clusterdiscovery"
 	"github.com/openshift/origin/pkg/clioptions/imagesetup"
 	"github.com/openshift/origin/pkg/clioptions/upgradeoptions"
@@ -74,17 +76,17 @@ func InitializeOpenShiftTestsExtensionFramework() (*extension.Registry, *extensi
 		return nil, nil, fmt.Errorf("failed to build extension test specs: %w", err)
 	}
 
+	// Apply annotations to test names only for upstream tests
+	specs.Walk(func(spec *extensiontests.ExtensionTestSpec) {
+		if append, ok := k8sgenerated.Annotations[spec.Name]; ok {
+			spec.Name += append
+		}
+	})
+
 	klog.Infof("Found %d test specs", len(specs))
 	// Filter out kube tests, vendor filtering isn't working within origin
 	specs = specs.Select(func(spec *extensiontests.ExtensionTestSpec) bool {
-		for _, cl := range spec.CodeLocations {
-			// If there is a CodeLocation for origin, that isn't simply "framework" it is not a vendored test
-			if strings.Contains(cl, "github.com/openshift/origin/") &&
-				!strings.Contains(cl, "github.com/openshift/origin/test/extended/util/framework.go") {
-				return true
-			}
-		}
-		return false
+		return !strings.Contains(spec.Name, "[Suite:k8s")
 	})
 	klog.Infof("%d test specs remain, after filtering out k8s", len(specs))