From 77f482c553b2f50e688964635084790573aaa0a0 Mon Sep 17 00:00:00 2001 From: YuikoTakada Date: Tue, 14 Jan 2020 03:24:23 +0000 Subject: [PATCH] WIP: use e2eskipper package in test/e2e/cloud --- test/e2e/cloud/BUILD | 1 + test/e2e/cloud/gcp/BUILD | 1 + test/e2e/cloud/gcp/addon_update.go | 3 ++- test/e2e/cloud/gcp/cluster_upgrade.go | 3 ++- test/e2e/cloud/gcp/ha_master.go | 3 ++- test/e2e/cloud/gcp/node_lease.go | 5 +++-- test/e2e/cloud/gcp/reboot.go | 3 ++- test/e2e/cloud/gcp/resize_nodes.go | 5 +++-- test/e2e/cloud/gcp/restart.go | 3 ++- test/e2e/cloud/nodes.go | 3 ++- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/test/e2e/cloud/BUILD b/test/e2e/cloud/BUILD index 8b3c579f37e..c3954362c8d 100644 --- a/test/e2e/cloud/BUILD +++ b/test/e2e/cloud/BUILD @@ -17,6 +17,7 @@ go_library( "//test/e2e/cloud/gcp:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/framework/node:go_default_library", + "//test/e2e/framework/skipper:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", ], ) diff --git a/test/e2e/cloud/gcp/BUILD b/test/e2e/cloud/gcp/BUILD index 069b7155e02..656e81ea4a2 100644 --- a/test/e2e/cloud/gcp/BUILD +++ b/test/e2e/cloud/gcp/BUILD @@ -36,6 +36,7 @@ go_library( "//test/e2e/framework/kubelet:go_default_library", "//test/e2e/framework/node:go_default_library", "//test/e2e/framework/pod:go_default_library", + "//test/e2e/framework/skipper:go_default_library", "//test/e2e/framework/ssh:go_default_library", "//test/e2e/upgrades:go_default_library", "//test/e2e/upgrades/apps:go_default_library", diff --git a/test/e2e/cloud/gcp/addon_update.go b/test/e2e/cloud/gcp/addon_update.go index 3a3fe4c61cd..31edd3290e7 100644 --- a/test/e2e/cloud/gcp/addon_update.go +++ b/test/e2e/cloud/gcp/addon_update.go @@ -30,6 +30,7 @@ import ( "k8s.io/apimachinery/pkg/util/wait" clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/test/e2e/framework" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" testutils "k8s.io/kubernetes/test/utils" imageutils "k8s.io/kubernetes/test/utils/image" @@ -243,7 +244,7 @@ var _ = SIGDescribe("Addon update", func() { // - master access // ... so the provider check should be identical to the intersection of // providers that provide those capabilities. - framework.SkipUnlessProviderIs("gce") + e2eskipper.SkipUnlessProviderIs("gce") //these tests are long, so I squeezed several cases in one scenario framework.ExpectNotEqual(sshClient, nil) diff --git a/test/e2e/cloud/gcp/cluster_upgrade.go b/test/e2e/cloud/gcp/cluster_upgrade.go index 2a190394641..e0c6e9e7aa2 100644 --- a/test/e2e/cloud/gcp/cluster_upgrade.go +++ b/test/e2e/cloud/gcp/cluster_upgrade.go @@ -38,6 +38,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework/config" "k8s.io/kubernetes/test/e2e/framework/ginkgowrapper" e2enode "k8s.io/kubernetes/test/e2e/framework/node" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" "k8s.io/kubernetes/test/e2e/upgrades" apps "k8s.io/kubernetes/test/e2e/upgrades/apps" "k8s.io/kubernetes/test/e2e/upgrades/storage" @@ -310,7 +311,7 @@ var _ = SIGDescribe("kube-proxy migration [Feature:KubeProxyDaemonSetMigration]" f := framework.NewDefaultFramework("kube-proxy-ds-migration") ginkgo.BeforeEach(func() { - framework.SkipUnlessProviderIs("gce") + e2eskipper.SkipUnlessProviderIs("gce") }) ginkgo.Describe("Upgrade kube-proxy from static pods to a DaemonSet", func() { diff --git a/test/e2e/cloud/gcp/ha_master.go b/test/e2e/cloud/gcp/ha_master.go index bc09b29845c..41f3884a75e 100644 --- a/test/e2e/cloud/gcp/ha_master.go +++ b/test/e2e/cloud/gcp/ha_master.go @@ -33,6 +33,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" ) func addMasterReplica(zone string) error { @@ -166,7 +167,7 @@ var _ = SIGDescribe("HA-master [Feature:HAMaster]", func() { var existingRCs []string ginkgo.BeforeEach(func() { - framework.SkipUnlessProviderIs("gce") + e2eskipper.SkipUnlessProviderIs("gce") c = f.ClientSet ns = f.Namespace.Name framework.ExpectNoError(waitForMasters(framework.TestContext.CloudConfig.MasterName, c, 1, 10*time.Minute)) diff --git a/test/e2e/cloud/gcp/node_lease.go b/test/e2e/cloud/gcp/node_lease.go index 0fd0bea94dd..7e8bd8e4927 100644 --- a/test/e2e/cloud/gcp/node_lease.go +++ b/test/e2e/cloud/gcp/node_lease.go @@ -27,6 +27,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" "github.com/onsi/ginkgo" "github.com/onsi/gomega" @@ -57,8 +58,8 @@ var _ = SIGDescribe("[Disruptive]NodeLease", func() { ginkgo.BeforeEach(func() { skipped = true - framework.SkipUnlessProviderIs("gce", "gke", "aws") - framework.SkipUnlessNodeCountIsAtLeast(2) + e2eskipper.SkipUnlessProviderIs("gce", "gke", "aws") + e2eskipper.SkipUnlessNodeCountIsAtLeast(2) skipped = false }) diff --git a/test/e2e/cloud/gcp/reboot.go b/test/e2e/cloud/gcp/reboot.go index d56ed269536..731b496dc83 100644 --- a/test/e2e/cloud/gcp/reboot.go +++ b/test/e2e/cloud/gcp/reboot.go @@ -32,6 +32,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" testutils "k8s.io/kubernetes/test/utils" @@ -60,7 +61,7 @@ var _ = SIGDescribe("Reboot [Disruptive] [Feature:Reboot]", func() { // (the limiting factor is the implementation of util.go's e2essh.GetSigner(...)). // Cluster must support node reboot - framework.SkipUnlessProviderIs(framework.ProvidersWithSSH...) + e2eskipper.SkipUnlessProviderIs(framework.ProvidersWithSSH...) }) ginkgo.AfterEach(func() { diff --git a/test/e2e/cloud/gcp/resize_nodes.go b/test/e2e/cloud/gcp/resize_nodes.go index 75d8b201af2..05c702b1375 100644 --- a/test/e2e/cloud/gcp/resize_nodes.go +++ b/test/e2e/cloud/gcp/resize_nodes.go @@ -27,6 +27,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" "github.com/onsi/ginkgo" ) @@ -68,8 +69,8 @@ var _ = SIGDescribe("Nodes [Disruptive]", func() { ginkgo.BeforeEach(func() { skipped = true - framework.SkipUnlessProviderIs("gce", "gke", "aws") - framework.SkipUnlessNodeCountIsAtLeast(2) + e2eskipper.SkipUnlessProviderIs("gce", "gke", "aws") + e2eskipper.SkipUnlessNodeCountIsAtLeast(2) skipped = false }) diff --git a/test/e2e/cloud/gcp/restart.go b/test/e2e/cloud/gcp/restart.go index b6549227b0c..de62d8345b3 100644 --- a/test/e2e/cloud/gcp/restart.go +++ b/test/e2e/cloud/gcp/restart.go @@ -27,6 +27,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" testutils "k8s.io/kubernetes/test/utils" "github.com/onsi/ginkgo" @@ -51,7 +52,7 @@ var _ = SIGDescribe("Restart [Disruptive]", func() { ginkgo.BeforeEach(func() { // This test requires the ability to restart all nodes, so the provider // check must be identical to that call. - framework.SkipUnlessProviderIs("gce", "gke") + e2eskipper.SkipUnlessProviderIs("gce", "gke") var err error ps, err = testutils.NewPodStore(f.ClientSet, metav1.NamespaceSystem, labels.Everything(), fields.Everything()) framework.ExpectNoError(err) diff --git a/test/e2e/cloud/nodes.go b/test/e2e/cloud/nodes.go index f0eb8511201..7e57e6670b7 100644 --- a/test/e2e/cloud/nodes.go +++ b/test/e2e/cloud/nodes.go @@ -25,6 +25,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/test/e2e/framework" e2enode "k8s.io/kubernetes/test/e2e/framework/node" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" "github.com/onsi/ginkgo" ) @@ -36,7 +37,7 @@ var _ = SIGDescribe("[Feature:CloudProvider][Disruptive] Nodes", func() { ginkgo.BeforeEach(func() { // Only supported in AWS/GCE because those are the only cloud providers // where E2E test are currently running. - framework.SkipUnlessProviderIs("aws", "gce", "gke") + e2eskipper.SkipUnlessProviderIs("aws", "gce", "gke") c = f.ClientSet })