Skip to content

Commit 0fe3840

Browse files
committed
stop annotating k8s tests and remove dependency on annotation framework + generated manifests placeholder
1 parent 9baee95 commit 0fe3840

File tree

4 files changed

+0
-14092
lines changed

4 files changed

+0
-14092
lines changed

pkg/test/extensions/binary.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ import (
2727
"k8s.io/klog/v2"
2828
k8simage "k8s.io/kubernetes/test/utils/image"
2929

30-
k8sgenerated "k8s.io/kubernetes/openshift-hack/e2e/annotate/generated"
31-
3230
"github.com/openshift/origin/pkg/clioptions/clusterdiscovery"
3331
"github.com/openshift/origin/pkg/clioptions/imagesetup"
3432
"github.com/openshift/origin/pkg/clioptions/upgradeoptions"
@@ -76,13 +74,6 @@ func InitializeOpenShiftTestsExtensionFramework() (*extension.Registry, *extensi
7674
return nil, nil, fmt.Errorf("failed to build extension test specs: %w", err)
7775
}
7876

79-
// Apply annotations to test names only for upstream tests
80-
specs.Walk(func(spec *extensiontests.ExtensionTestSpec) {
81-
if append, ok := k8sgenerated.Annotations[spec.Name]; ok {
82-
spec.Name += append
83-
}
84-
})
85-
8677
klog.Infof("Found %d test specs", len(specs))
8778
// Filter out kube tests, vendor filtering isn't working within origin
8879
specs = specs.Select(func(spec *extensiontests.ExtensionTestSpec) bool {

0 commit comments

Comments
 (0)