Merge pull request #22014 from ihmccreery/decouple-node-upgrade

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))
@@ -211,10 +207,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))
@@ -265,15 +257,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)