Skip to content

Commit b8d86a7

Browse files
committed
retain CSI tests when filtering out upstream k8s tests
1 parent f761b4f commit b8d86a7

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

pkg/test/extensions/binary.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,13 @@ func InitializeOpenShiftTestsExtensionFramework() (*extension.Registry, *extensi
7575
}
7676

7777
klog.Infof("Found %d test specs", len(specs))
78-
// Filter out kube tests, vendor filtering isn't working within origin
78+
// Filter out kube tests (while retaining CSI tests), vendor filtering isn't working within origin
79+
csiPrefix := "External Storage"
7980
specs = specs.Select(func(spec *extensiontests.ExtensionTestSpec) bool {
81+
// The CSI tests all have the same prefix, and we need to retain them all
82+
if strings.HasPrefix(spec.Name, csiPrefix) {
83+
return true
84+
}
8085
for _, cl := range spec.CodeLocations {
8186
// If there is a CodeLocation for origin, that isn't simply "framework" it is not a vendored test
8287
if strings.Contains(cl, "github.com/openshift/origin/") &&

0 commit comments

Comments
 (0)