From ac0e7b57ab047db3b4494b0d82b772968c37ef04 Mon Sep 17 00:00:00 2001 From: wojtekt Date: Thu, 11 Mar 2021 14:41:16 +0100 Subject: [PATCH] Remove etcd upgrade test - it's not being run --- test/e2e/cloud/gcp/cluster_upgrade.go | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/test/e2e/cloud/gcp/cluster_upgrade.go b/test/e2e/cloud/gcp/cluster_upgrade.go index cf16b2bb095..ac5c24e70ff 100644 --- a/test/e2e/cloud/gcp/cluster_upgrade.go +++ b/test/e2e/cloud/gcp/cluster_upgrade.go @@ -18,7 +18,6 @@ package gcp import ( "fmt" - "time" "k8s.io/kubernetes/test/e2e/framework" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" @@ -136,28 +135,6 @@ var _ = ginkgo.Describe("Downgrade [Feature:Downgrade]", func() { }) }) -var _ = ginkgo.Describe("etcd Upgrade [Feature:EtcdUpgrade]", func() { - f := framework.NewDefaultFramework("etc-upgrade") - - ginkgo.Describe("etcd upgrade", func() { - ginkgo.It("should maintain a functioning cluster", func() { - upgCtx, err := GetUpgradeContext(f.ClientSet.Discovery()) - framework.ExpectNoError(err) - - testSuite := &junit.TestSuite{Name: "Etcd upgrade"} - etcdTest := &junit.TestCase{Name: "[sig-cloud-provider-gcp] etcd-upgrade", Classname: "upgrade_tests"} - testSuite.TestCases = append(testSuite.TestCases, etcdTest) - - upgradeFunc := func() { - start := time.Now() - defer upgrades.FinalizeUpgradeTest(start, etcdTest) - framework.ExpectNoError(framework.EtcdUpgrade(framework.TestContext.EtcdUpgradeStorage, framework.TestContext.EtcdUpgradeVersion)) - } - upgrades.RunUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.EtcdUpgrade, upgradeFunc) - }) - }) -}) - // TODO(#98326): Split the test by SIGs, move to appropriate directories and use SIGDescribe. var _ = ginkgo.Describe("gpu Upgrade [Feature:GPUUpgrade]", func() { f := framework.NewDefaultFramework("gpu-upgrade")