PR #70862 made each driver responsible for resetting its config, but as it turned out, one place was missed in that PR: the in-tree gcepd sets a node selector. Not resetting that caused other tests to fail randomly depending on test execution order. Now the test suite resets the config by taking a copy after setting up the driver and restoring that copy before each test. Long term the intention is to separate the entire test config from the static driver info (https://github.com/kubernetes/kubernetes/issues/72288), but for now resetting the config is the fastest way to fix the test flake. Fixes: #72378
92 lines
2.5 KiB
Go
92 lines
2.5 KiB
Go
/*
|
|
Copyright 2018 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package storage
|
|
|
|
import (
|
|
. "github.com/onsi/ginkgo"
|
|
"k8s.io/kubernetes/test/e2e/framework"
|
|
"k8s.io/kubernetes/test/e2e/storage/drivers"
|
|
"k8s.io/kubernetes/test/e2e/storage/testpatterns"
|
|
"k8s.io/kubernetes/test/e2e/storage/testsuites"
|
|
"k8s.io/kubernetes/test/e2e/storage/utils"
|
|
)
|
|
|
|
// List of testDrivers to be executed in below loop
|
|
var testDrivers = []func(config testsuites.TestConfig) testsuites.TestDriver{
|
|
drivers.InitNFSDriver,
|
|
drivers.InitGlusterFSDriver,
|
|
drivers.InitISCSIDriver,
|
|
drivers.InitRbdDriver,
|
|
drivers.InitCephFSDriver,
|
|
drivers.InitHostPathDriver,
|
|
drivers.InitHostPathSymlinkDriver,
|
|
drivers.InitEmptydirDriver,
|
|
drivers.InitCinderDriver,
|
|
drivers.InitGcePdDriver,
|
|
drivers.InitVSphereDriver,
|
|
drivers.InitAzureDriver,
|
|
drivers.InitAwsDriver,
|
|
}
|
|
|
|
// List of testSuites to be executed in below loop
|
|
var testSuites = []func() testsuites.TestSuite{
|
|
testsuites.InitVolumesTestSuite,
|
|
testsuites.InitVolumeIOTestSuite,
|
|
testsuites.InitVolumeModeTestSuite,
|
|
testsuites.InitSubPathTestSuite,
|
|
testsuites.InitProvisioningTestSuite,
|
|
}
|
|
|
|
func intreeTunePattern(patterns []testpatterns.TestPattern) []testpatterns.TestPattern {
|
|
return patterns
|
|
}
|
|
|
|
// This executes testSuites for in-tree volumes.
|
|
var _ = utils.SIGDescribe("In-tree Volumes", func() {
|
|
f := framework.NewDefaultFramework("volumes")
|
|
|
|
var (
|
|
// Common configuration options for all drivers.
|
|
config = testsuites.TestConfig{
|
|
Framework: f,
|
|
Prefix: "in-tree",
|
|
}
|
|
)
|
|
|
|
for _, initDriver := range testDrivers {
|
|
curDriver := initDriver(config)
|
|
curConfig := curDriver.GetDriverInfo().Config
|
|
Context(testsuites.GetDriverNameWithFeatureTags(curDriver), func() {
|
|
BeforeEach(func() {
|
|
// Reset config. The driver might have modified its copy
|
|
// in a previous test.
|
|
curDriver.GetDriverInfo().Config = curConfig
|
|
|
|
// setupDriver
|
|
curDriver.CreateDriver()
|
|
})
|
|
|
|
AfterEach(func() {
|
|
// Cleanup driver
|
|
curDriver.CleanupDriver()
|
|
})
|
|
|
|
testsuites.RunTestSuite(f, curDriver, testSuites, intreeTunePattern)
|
|
})
|
|
}
|
|
})
|