Skip to content

TRT-1854: remove upstream annotation framework #30305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 1, 2025
+8 −14,093
Merged

TRT-1854: remove upstream annotation framework #30305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9baee95
filter out k8s tests via code locations rather than suite info
smg247 Sep 25, 2025
0fe3840
stop annotating k8s tests and remove dependency on annotation framewo…
smg247 Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions pkg/test/extensions/binary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ 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"
Expand Down Expand Up @@ -76,17 +74,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 {
return !strings.Contains(spec.Name, "[Suite:k8s")
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
})
klog.Infof("%d test specs remain, after filtering out k8s", len(specs))

Expand Down
Loading