From 8c481022c1cfc8d649b6b559ce93ce8a33bcb92a Mon Sep 17 00:00:00 2001 From: tanjunchen <2799194073@qq.com> Date: Fri, 10 Jan 2020 16:21:12 +0800 Subject: [PATCH] e2e/node/:Use e2eskipper package --- test/e2e/node/BUILD | 1 + test/e2e/node/apparmor.go | 3 ++- test/e2e/node/crictl.go | 5 +++-- test/e2e/node/kubelet.go | 3 ++- test/e2e/node/node_problem_detector.go | 11 ++++++----- test/e2e/node/ssh.go | 5 +++-- 6 files changed, 17 insertions(+), 11 deletions(-) diff --git a/test/e2e/node/BUILD b/test/e2e/node/BUILD index 21f249d454b..b256ff6c503 100644 --- a/test/e2e/node/BUILD +++ b/test/e2e/node/BUILD @@ -47,6 +47,7 @@ go_library( "//test/e2e/framework/pod:go_default_library", "//test/e2e/framework/rc:go_default_library", "//test/e2e/framework/security:go_default_library", + "//test/e2e/framework/skipper:go_default_library", "//test/e2e/framework/ssh:go_default_library", "//test/e2e/framework/volume:go_default_library", "//test/e2e/perftype:go_default_library", diff --git a/test/e2e/node/apparmor.go b/test/e2e/node/apparmor.go index e311d876e70..6239050fa6d 100644 --- a/test/e2e/node/apparmor.go +++ b/test/e2e/node/apparmor.go @@ -20,6 +20,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl" e2esecurity "k8s.io/kubernetes/test/e2e/framework/security" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" "github.com/onsi/ginkgo" ) @@ -29,7 +30,7 @@ var _ = SIGDescribe("AppArmor", func() { ginkgo.Context("load AppArmor profiles", func() { ginkgo.BeforeEach(func() { - framework.SkipIfAppArmorNotSupported() + e2eskipper.SkipIfAppArmorNotSupported() e2esecurity.LoadAppArmorProfiles(f.Namespace.Name, f.ClientSet) }) ginkgo.AfterEach(func() { diff --git a/test/e2e/node/crictl.go b/test/e2e/node/crictl.go index 3084d58bc7e..7d35012c4da 100644 --- a/test/e2e/node/crictl.go +++ b/test/e2e/node/crictl.go @@ -21,6 +21,7 @@ import ( "strings" "k8s.io/kubernetes/test/e2e/framework" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" "github.com/onsi/ginkgo" @@ -31,9 +32,9 @@ var _ = SIGDescribe("crictl", func() { ginkgo.BeforeEach(func() { // `crictl` is not available on all cloud providers. - framework.SkipUnlessProviderIs("gce", "gke") + e2eskipper.SkipUnlessProviderIs("gce", "gke") // The test requires $HOME/.ssh/id_rsa key to be present. - framework.SkipUnlessSSHKeyPresent() + e2eskipper.SkipUnlessSSHKeyPresent() }) ginkgo.It("should be able to run crictl on the node", func() { diff --git a/test/e2e/node/kubelet.go b/test/e2e/node/kubelet.go index f814e91bf25..959b2a82868 100644 --- a/test/e2e/node/kubelet.go +++ b/test/e2e/node/kubelet.go @@ -33,6 +33,7 @@ import ( e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2erc "k8s.io/kubernetes/test/e2e/framework/rc" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" "k8s.io/kubernetes/test/e2e/framework/volume" testutils "k8s.io/kubernetes/test/utils" @@ -415,7 +416,7 @@ var _ = SIGDescribe("kubelet", func() { } ginkgo.BeforeEach(func() { - framework.SkipUnlessProviderIs(framework.ProvidersWithSSH...) + e2eskipper.SkipUnlessProviderIs(framework.ProvidersWithSSH...) _, nfsServerPod, nfsIP = volume.NewNFSServer(c, ns, []string{"-G", "777", "/exports"}) }) diff --git a/test/e2e/node/node_problem_detector.go b/test/e2e/node/node_problem_detector.go index 3b365b0f9fd..47d7dd9ff5e 100644 --- a/test/e2e/node/node_problem_detector.go +++ b/test/e2e/node/node_problem_detector.go @@ -30,6 +30,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet" e2enode "k8s.io/kubernetes/test/e2e/framework/node" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" testutils "k8s.io/kubernetes/test/utils" @@ -47,15 +48,15 @@ var _ = SIGDescribe("NodeProblemDetector [DisabledForLargeClusters]", func() { f := framework.NewDefaultFramework("node-problem-detector") ginkgo.BeforeEach(func() { - framework.SkipUnlessSSHKeyPresent() - framework.SkipUnlessProviderIs(framework.ProvidersWithSSH...) - framework.SkipUnlessProviderIs("gce", "gke") - framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu") + e2eskipper.SkipUnlessSSHKeyPresent() + e2eskipper.SkipUnlessProviderIs(framework.ProvidersWithSSH...) + e2eskipper.SkipUnlessProviderIs("gce", "gke") + e2eskipper.SkipUnlessNodeOSDistroIs("gci", "ubuntu") e2enode.WaitForTotalHealthy(f.ClientSet, time.Minute) }) ginkgo.It("should run without error", func() { - framework.SkipUnlessSSHKeyPresent() + e2eskipper.SkipUnlessSSHKeyPresent() ginkgo.By("Getting all nodes and their SSH-able IP addresses") nodes, err := e2enode.GetReadySchedulableNodes(f.ClientSet) diff --git a/test/e2e/node/ssh.go b/test/e2e/node/ssh.go index 13d4bba533a..9bbf5a6ab25 100644 --- a/test/e2e/node/ssh.go +++ b/test/e2e/node/ssh.go @@ -21,6 +21,7 @@ import ( "strings" "k8s.io/kubernetes/test/e2e/framework" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" e2essh "k8s.io/kubernetes/test/e2e/framework/ssh" "github.com/onsi/ginkgo" @@ -34,11 +35,11 @@ var _ = SIGDescribe("SSH", func() { ginkgo.BeforeEach(func() { // When adding more providers here, also implement their functionality in e2essh.GetSigner(...). - framework.SkipUnlessProviderIs(framework.ProvidersWithSSH...) + e2eskipper.SkipUnlessProviderIs(framework.ProvidersWithSSH...) // This test SSH's into the node for which it needs the $HOME/.ssh/id_rsa key to be present. So // we should skip if the environment does not have the key (not all CI systems support this use case) - framework.SkipUnlessSSHKeyPresent() + e2eskipper.SkipUnlessSSHKeyPresent() }) ginkgo.It("should SSH to all nodes and run commands", func() {