Skip to content

K
k3s
Unverified Commit 252286e7 authored by Davanum Srinivas's avatar Davanum Srinivas
Browse files
Options

Skip Sysctl tests against v1.11.0-alpha.0 and newer

1.10 e2e tests get run against 1.11.0+ masters during upgrade tests. This fails as Sysctl moved from annotations to fields, so we should check the version and avoid running these tests.
parent c2a8c9ce
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 0 deletions
test/e2e/common/sysctl.go
View file @ 252286e7
...@@ -22,12 +22,15 @@ import ( ...@@ -22,12 +22,15 @@ import (
"k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/uuid"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
"k8s.io/kubernetes/pkg/kubelet/sysctl" "k8s.io/kubernetes/pkg/kubelet/sysctl"
utilversion "k8s.io/kubernetes/pkg/util/version"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )
var sysctlFeatureFromAnnotationsToAPIFields = utilversion.MustParseSemantic("v1.11.0-alpha.0")
var _ = framework.KubeDescribe("Sysctls", func() { var _ = framework.KubeDescribe("Sysctls", func() {
f := framework.NewDefaultFramework("sysctl") f := framework.NewDefaultFramework("sysctl")
var podClient *framework.PodClient var podClient *framework.PodClient
...@@ -54,6 +57,14 @@ var _ = framework.KubeDescribe("Sysctls", func() { ...@@ -54,6 +57,14 @@ var _ = framework.KubeDescribe("Sysctls", func() {
} }
BeforeEach(func() { BeforeEach(func() {
var err error
skipSysctlTests, err := framework.ServerVersionGTE(sysctlFeatureFromAnnotationsToAPIFields, f.ClientSet.Discovery())
Expect(err).NotTo(HaveOccurred())
if skipSysctlTests {
framework.Skipf("Skipping all Sysctls tests. Running version > %q", sysctlFeatureFromAnnotationsToAPIFields)
}
podClient = f.PodClient() podClient = f.PodClient()
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment