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

move upgrade test frameworks closer to Describe

Browse Source
This commit is contained in:
Shihang Zhang 2021-04-14 09:12:55 -07:00
parent 74497632f4
commit cf3232ca65
6 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/cloud/gcp/apps/stateful_apps.go
View File

@ -34,6 +34,7 @@ var upgradeTests = []upgrades.Test{
var _ = SIGDescribe("stateful Upgrade [Feature:StatefulUpgrade]", func() {
f := framework.NewDefaultFramework("stateful-upgrade")
testFrameworks := upgrades.CreateUpgradeFrameworks(upgradeTests)
ginkgo.Describe("stateful upgrade", func() {
ginkgo.It("should maintain a functioning cluster", func() {
@ -45,7 +46,7 @@ var _ = SIGDescribe("stateful Upgrade [Feature:StatefulUpgrade]", func() {
testSuite.TestCases = append(testSuite.TestCases, statefulUpgradeTest)
upgradeFunc := common.ClusterUpgradeFunc(f, upgCtx, statefulUpgradeTest, nil, nil)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testFrameworks, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
})
})
})

3
test/e2e/cloud/gcp/auth/service_account_admission_controller_migration.go
View File

@ -32,6 +32,7 @@ var upgradeTests = []upgrades.Test{
var _ = SIGDescribe("ServiceAccount admission controller migration [Feature:BoundServiceAccountTokenVolume]", func() {
f := framework.NewDefaultFramework("serviceaccount-admission-controller-migration")
testFrameworks := upgrades.CreateUpgradeFrameworks(upgradeTests)
ginkgo.Describe("master upgrade", func() {
ginkgo.It("should maintain a functioning cluster", func() {
@ -47,7 +48,7 @@ var _ = SIGDescribe("ServiceAccount admission controller migration [Feature:Boun
extraEnvs := []string{"KUBE_FEATURE_GATES=BoundServiceAccountTokenVolume=true"}
upgradeFunc := common.ControlPlaneUpgradeFunc(f, upgCtx, serviceaccountAdmissionControllerMigrationTest, extraEnvs)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.MasterUpgrade, upgradeFunc)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testFrameworks, testSuite, upgrades.MasterUpgrade, upgradeFunc)
})
})
})

8
test/e2e/cloud/gcp/cluster_upgrade.go
View File

@ -50,6 +50,7 @@ var upgradeTests = []upgrades.Test{
var _ = SIGDescribe("Upgrade [Feature:Upgrade]", func() {
f := framework.NewDefaultFramework("cluster-upgrade")
testFrameworks := upgrades.CreateUpgradeFrameworks(upgradeTests)
// Create the frameworks here because we can only create them
// in a "Describe".
@ -66,7 +67,7 @@ var _ = SIGDescribe("Upgrade [Feature:Upgrade]", func() {
testSuite.TestCases = append(testSuite.TestCases, masterUpgradeTest, nil)
upgradeFunc := common.ControlPlaneUpgradeFunc(f, upgCtx, masterUpgradeTest, nil)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.MasterUpgrade, upgradeFunc)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testFrameworks, testSuite, upgrades.MasterUpgrade, upgradeFunc)
})
})
@ -80,13 +81,14 @@ var _ = SIGDescribe("Upgrade [Feature:Upgrade]", func() {
testSuite.TestCases = append(testSuite.TestCases, clusterUpgradeTest)
upgradeFunc := common.ClusterUpgradeFunc(f, upgCtx, clusterUpgradeTest, nil, nil)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testFrameworks, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
})
})
})
var _ = SIGDescribe("Downgrade [Feature:Downgrade]", func() {
f := framework.NewDefaultFramework("cluster-downgrade")
testFrameworks := upgrades.CreateUpgradeFrameworks(upgradeTests)
ginkgo.Describe("cluster downgrade", func() {
ginkgo.It("should maintain a functioning cluster [Feature:ClusterDowngrade]", func() {
@ -98,7 +100,7 @@ var _ = SIGDescribe("Downgrade [Feature:Downgrade]", func() {
testSuite.TestCases = append(testSuite.TestCases, clusterDowngradeTest)
upgradeFunc := common.ClusterDowngradeFunc(f, upgCtx, clusterDowngradeTest, nil, nil)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testFrameworks, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
})
})
})

6
test/e2e/cloud/gcp/network/kube_proxy_migration.go
View File

@ -45,6 +45,8 @@ func kubeProxyDaemonSetExtraEnvs(enableKubeProxyDaemonSet bool) []string {
var _ = SIGDescribe("kube-proxy migration [Feature:KubeProxyDaemonSetMigration]", func() {
f := framework.NewDefaultFramework("kube-proxy-ds-migration")
upgradeTestFrameworks := upgrades.CreateUpgradeFrameworks(upgradeTests)
downgradeTestsFrameworks := upgrades.CreateUpgradeFrameworks(downgradeTests)
ginkgo.BeforeEach(func() {
e2eskipper.SkipUnlessProviderIs("gce")
@ -64,7 +66,7 @@ var _ = SIGDescribe("kube-proxy migration [Feature:KubeProxyDaemonSetMigration]"
extraEnvs := kubeProxyDaemonSetExtraEnvs(true)
upgradeFunc := common.ClusterUpgradeFunc(f, upgCtx, kubeProxyUpgradeTest, extraEnvs, extraEnvs)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, upgradeTestFrameworks, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
})
})
@ -82,7 +84,7 @@ var _ = SIGDescribe("kube-proxy migration [Feature:KubeProxyDaemonSetMigration]"
extraEnvs := kubeProxyDaemonSetExtraEnvs(false)
upgradeFunc := common.ClusterDowngradeFunc(f, upgCtx, kubeProxyDowngradeTest, extraEnvs, extraEnvs)
upgrades.RunUpgradeSuite(upgCtx, downgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
upgrades.RunUpgradeSuite(upgCtx, downgradeTests, downgradeTestsFrameworks, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
})
})
})

7
test/e2e/cloud/gcp/node/gpu.go
View File

@ -32,6 +32,7 @@ var upgradeTests = []upgrades.Test{
var _ = SIGDescribe("gpu Upgrade [Feature:GPUUpgrade]", func() {
f := framework.NewDefaultFramework("gpu-upgrade")
testFrameworks := upgrades.CreateUpgradeFrameworks(upgradeTests)
ginkgo.Describe("master upgrade", func() {
ginkgo.It("should NOT disrupt gpu pod [Feature:GPUMasterUpgrade]", func() {
@ -43,7 +44,7 @@ var _ = SIGDescribe("gpu Upgrade [Feature:GPUUpgrade]", func() {
testSuite.TestCases = append(testSuite.TestCases, gpuUpgradeTest)
upgradeFunc := common.ControlPlaneUpgradeFunc(f, upgCtx, gpuUpgradeTest, nil)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.MasterUpgrade, upgradeFunc)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testFrameworks, testSuite, upgrades.MasterUpgrade, upgradeFunc)
})
})
ginkgo.Describe("cluster upgrade", func() {
@ -56,7 +57,7 @@ var _ = SIGDescribe("gpu Upgrade [Feature:GPUUpgrade]", func() {
testSuite.TestCases = append(testSuite.TestCases, gpuUpgradeTest)
upgradeFunc := common.ClusterUpgradeFunc(f, upgCtx, gpuUpgradeTest, nil, nil)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testFrameworks, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
})
})
ginkgo.Describe("cluster downgrade", func() {
@ -69,7 +70,7 @@ var _ = SIGDescribe("gpu Upgrade [Feature:GPUUpgrade]", func() {
testSuite.TestCases = append(testSuite.TestCases, gpuDowngradeTest)
upgradeFunc := common.ClusterDowngradeFunc(f, upgCtx, gpuDowngradeTest, nil, nil)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testFrameworks, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
})
})
})

5
test/e2e/upgrades/upgrade_suite.go
View File

@ -95,7 +95,7 @@ func FinalizeUpgradeTest(start time.Time, tc *junit.TestCase) {
}
}
func createUpgradeFrameworks(tests []Test) map[string]*framework.Framework {
func CreateUpgradeFrameworks(tests []Test) map[string]*framework.Framework {
nsFilter := regexp.MustCompile("[^[:word:]-]+") // match anything that's not a word character or hyphen
testFrameworks := map[string]*framework.Framework{}
for _, t := range tests {
@ -110,12 +110,11 @@ func createUpgradeFrameworks(tests []Test) map[string]*framework.Framework {
func RunUpgradeSuite(
upgCtx *UpgradeContext,
tests []Test,
testFrameworks map[string]*framework.Framework,
testSuite *junit.TestSuite,
upgradeType UpgradeType,
upgradeFunc func(),
) {
testFrameworks := createUpgradeFrameworks(tests)
cm := chaosmonkey.New(upgradeFunc)
for _, t := range tests {
testCase := &junit.TestCase{