Revert "stop annotating k8s tests and remove dependency on annotation framework + generated manifests placeholder"

This reverts commit 0fe3840.

Author: jsafrane

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,6 +76,13 @@ 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 {