From 4b056a615a0699a9e39da0a84b0ba31718a053e6 Mon Sep 17 00:00:00 2001 From: David Porter Date: Mon, 6 Sep 2021 16:17:11 -0700 Subject: [PATCH] Skip runtimeclass test unless provider GCE This test case requires special test-handler setup which is only done for gce clusters created by kube-up scripts. Let's skip the test when run under other providers. --- test/e2e/common/node/runtimeclass.go | 5 +++++ test/e2e/node/runtimeclass.go | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/test/e2e/common/node/runtimeclass.go b/test/e2e/common/node/runtimeclass.go index 6a4836c4f39..083f210a522 100644 --- a/test/e2e/common/node/runtimeclass.go +++ b/test/e2e/common/node/runtimeclass.go @@ -35,6 +35,7 @@ import ( e2eevents "k8s.io/kubernetes/test/e2e/framework/events" 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" ) @@ -71,6 +72,10 @@ var _ = SIGDescribe("RuntimeClass", func() { // This test requires that the PreconfiguredRuntimeHandler has already been set up on nodes. ginkgo.It("should run a Pod requesting a RuntimeClass with a configured handler [NodeFeature:RuntimeHandler]", func() { + // Requires special setup of test-handler which is only done in GCE kube-up environment + // see https://github.com/kubernetes/kubernetes/blob/eb729620c522753bc7ae61fc2c7b7ea19d4aad2f/cluster/gce/gci/configure-helper.sh#L3069-L3076 + e2eskipper.SkipUnlessProviderIs("gce") + // The built-in docker runtime does not support configuring runtime handlers. handler := e2enode.PreconfiguredRuntimeClassHandler(framework.TestContext.ContainerRuntime) diff --git a/test/e2e/node/runtimeclass.go b/test/e2e/node/runtimeclass.go index b9c9caf96da..9d10cb4c3b4 100644 --- a/test/e2e/node/runtimeclass.go +++ b/test/e2e/node/runtimeclass.go @@ -29,6 +29,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" "k8s.io/kubernetes/test/e2e/scheduling" "github.com/onsi/ginkgo" @@ -123,6 +124,10 @@ var _ = SIGDescribe("RuntimeClass", func() { }) ginkgo.It("should run a Pod requesting a RuntimeClass with scheduling without taints ", func() { + // Requires special setup of test-handler which is only done in GCE kube-up environment + // see https://github.com/kubernetes/kubernetes/blob/eb729620c522753bc7ae61fc2c7b7ea19d4aad2f/cluster/gce/gci/configure-helper.sh#L3069-L3076 + e2eskipper.SkipUnlessProviderIs("gce") + labelFooName := "foo-" + string(uuid.NewUUID()) labelFizzName := "fizz-" + string(uuid.NewUUID())