From 1bf69415cd6245d17ad212ae77c31a7a68fb7bfc Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Thu, 25 Feb 2016 13:37:16 -0800 Subject: [PATCH 1/2] Decouple node upgrade from master upgrade --- test/e2e/cluster_upgrade.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/test/e2e/cluster_upgrade.go b/test/e2e/cluster_upgrade.go index 54a1d422909..c257c68c581 100644 --- a/test/e2e/cluster_upgrade.go +++ b/test/e2e/cluster_upgrade.go @@ -211,10 +211,6 @@ var _ = Describe("Upgrade [Feature:Upgrade]", func() { }) Describe("upgrade-master", func() { - BeforeEach(func() { - SkipUnlessProviderIs("gce", "gke") - }) - It("should maintain responsive services", func() { By("Validating cluster before master upgrade") expectNoError(validate(f, svcName, rcName, ingress, replicas)) @@ -267,13 +263,7 @@ var _ = Describe("Upgrade [Feature:Upgrade]", func() { It("should maintain a functioning cluster", func() { SkipUnlessProviderIs("gce", "gke") - By("Validating cluster before master upgrade") - expectNoError(validate(f, svcName, rcName, ingress, replicas)) - By("Performing a master upgrade") - testMasterUpgrade(ip, v, masterUpgrade) - By("Checking master version") - expectNoError(checkMasterVersion(f.Client, v)) - By("Validating cluster after master upgrade") + By("Validating cluster before node upgrade") expectNoError(validate(f, svcName, rcName, ingress, replicas)) By("Performing a node upgrade") testNodeUpgrade(f, nodeUpgrade, replicas, v) From de3b17a86f1988871804f2b601f60a08b0f13f9b Mon Sep 17 00:00:00 2001 From: Isaac Hollander McCreery Date: Thu, 25 Feb 2016 13:40:22 -0800 Subject: [PATCH 2/2] Remove silent provider skips, since upgrade tests are feature tests, and aren't turned on by default anyway --- test/e2e/cluster_upgrade.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/test/e2e/cluster_upgrade.go b/test/e2e/cluster_upgrade.go index c257c68c581..f8692ca5885 100644 --- a/test/e2e/cluster_upgrade.go +++ b/test/e2e/cluster_upgrade.go @@ -196,10 +196,6 @@ var _ = Describe("Upgrade [Feature:Upgrade]", func() { }) Describe("kube-push", func() { - BeforeEach(func() { - SkipUnlessProviderIs("gce") - }) - It("of master should maintain responsive services", func() { By("Validating cluster before master upgrade") expectNoError(validate(f, svcName, rcName, ingress, replicas)) @@ -261,8 +257,6 @@ var _ = Describe("Upgrade [Feature:Upgrade]", func() { }) It("should maintain a functioning cluster", func() { - SkipUnlessProviderIs("gce", "gke") - By("Validating cluster before node upgrade") expectNoError(validate(f, svcName, rcName, ingress, replicas)) By("Performing a node upgrade")