github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #104858 from pohly/generic-ephemeral-volume-intree-tests

Browse Source 
e2e: enable generic ephemeral inline volume also for in-tree drivers
This commit is contained in:
Kubernetes Prow Robot 2021-09-10 14:49:01 -07:00 committed by GitHub
commit b47f8263e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/e2e/storage/testsuites/base.go
View File

@ -68,11 +68,16 @@ var BaseSuites = []func() storageframework.TestSuite{
InitTopologyTestSuite, InitTopologyTestSuite,
InitVolumeStressTestSuite, InitVolumeStressTestSuite,
InitFsGroupChangePolicyTestSuite, InitFsGroupChangePolicyTestSuite,
func() storageframework.TestSuite {
return InitCustomEphemeralTestSuite(GenericEphemeralTestPatterns())
},
} }
// CSISuites is a list of storage test suites that work only for CSI drivers // CSISuites is a list of storage test suites that work only for CSI drivers
var CSISuites = append(BaseSuites, var CSISuites = append(BaseSuites,
InitEphemeralTestSuite, func() storageframework.TestSuite {
return InitCustomEphemeralTestSuite(CSIEphemeralTestPatterns())
},
InitSnapshottableTestSuite, InitSnapshottableTestSuite,
InitSnapshottableStressTestSuite, InitSnapshottableStressTestSuite,
InitVolumePerformanceTestSuite, InitVolumePerformanceTestSuite,

29
test/e2e/storage/testsuites/ephemeral.go
View File

@ -53,9 +53,9 @@ func InitCustomEphemeralTestSuite(patterns []storageframework.TestPattern) stora
} }
} }
// InitEphemeralTestSuite returns ephemeralTestSuite that implements TestSuite interface // GenericEphemeralTestPatterns returns the test patterns for
// using test suite default patterns // generic ephemeral inline volumes.
func InitEphemeralTestSuite() storageframework.TestSuite { func GenericEphemeralTestPatterns() []storageframework.TestPattern {
genericLateBinding := storageframework.DefaultFsGenericEphemeralVolume genericLateBinding := storageframework.DefaultFsGenericEphemeralVolume
genericLateBinding.Name += " (late-binding)" genericLateBinding.Name += " (late-binding)"
genericLateBinding.BindingMode = storagev1.VolumeBindingWaitForFirstConsumer genericLateBinding.BindingMode = storagev1.VolumeBindingWaitForFirstConsumer
@ -64,13 +64,30 @@ func InitEphemeralTestSuite() storageframework.TestSuite {
genericImmediateBinding.Name += " (immediate-binding)" genericImmediateBinding.Name += " (immediate-binding)"
genericImmediateBinding.BindingMode = storagev1.VolumeBindingImmediate genericImmediateBinding.BindingMode = storagev1.VolumeBindingImmediate
patterns := []storageframework.TestPattern{ return []storageframework.TestPattern{
storageframework.DefaultFsCSIEphemeralVolume,
genericLateBinding, genericLateBinding,
genericImmediateBinding, genericImmediateBinding,
} }
}
return InitCustomEphemeralTestSuite(patterns) // CSIEphemeralTestPatterns returns the test patterns for
// CSI ephemeral inline volumes.
func CSIEphemeralTestPatterns() []storageframework.TestPattern {
return []storageframework.TestPattern{
storageframework.DefaultFsCSIEphemeralVolume,
}
}
// AllEphemeralTestPatterns returns all pre-defined test patterns for
// generic and CSI ephemeral inline volumes.
func AllEphemeralTestPatterns() []storageframework.TestPattern {
return append(GenericEphemeralTestPatterns(), CSIEphemeralTestPatterns()...)
}
// InitEphemeralTestSuite returns ephemeralTestSuite that implements TestSuite interface
// using test suite default patterns
func InitEphemeralTestSuite() storageframework.TestSuite {
return InitCustomEphemeralTestSuite(AllEphemeralTestPatterns())
} }
func (p *ephemeralTestSuite) GetTestSuiteInfo() storageframework.TestSuiteInfo { func (p *ephemeralTestSuite) GetTestSuiteInfo() storageframework.TestSuiteInfo {