Skip to content

Commit de04f52

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#87169 from s-ito-ts/87047_scheduling
Use e2eskipper package in e2e/scheduling and e2e/servicecatalog
2 parents 9173a5f + 4789e51 commit de04f52

File tree

8 files changed

+18
-10
lines changed

8 files changed

+18
-10
lines changed

‎test/e2e/scheduling/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ go_library(
5151
"//test/e2e/framework/rc:go_default_library",
5252
"//test/e2e/framework/replicaset:go_default_library",
5353
"//test/e2e/framework/service:go_default_library",
54+
"//test/e2e/framework/skipper:go_default_library",
5455
"//test/utils:go_default_library",
5556
"//test/utils/image:go_default_library",
5657
"//vendor/github.com/onsi/ginkgo:go_default_library",

‎test/e2e/scheduling/nvidia-gpus.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3333
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3434
"k8s.io/kubernetes/test/e2e/framework/providers/gce"
35+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3536
imageutils "k8s.io/kubernetes/test/utils/image"
3637

3738
"github.com/onsi/ginkgo"
@@ -309,7 +310,7 @@ func podNames(pods []v1.Pod) []string {
309310

310311
var _ = SIGDescribe("GPUDevicePluginAcrossRecreate [Feature:Recreate]", func() {
311312
ginkgo.BeforeEach(func() {
312-
framework.SkipUnlessProviderIs("gce", "gke")
313+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
313314
})
314315
f := framework.NewDefaultFramework("device-plugin-gpus-recreate")
315316
ginkgo.It("run Nvidia GPU Device Plugin tests with a recreation", func() {

‎test/e2e/scheduling/predicates.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3535
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3636
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
37+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3738
testutils "k8s.io/kubernetes/test/utils"
3839
imageutils "k8s.io/kubernetes/test/utils/image"
3940
k8utilnet "k8s.io/utils/net"
@@ -120,7 +121,7 @@ var _ = SIGDescribe("SchedulerPredicates [Serial]", func() {
120121
// It is so because we need to have precise control on what's running in the cluster.
121122
ginkgo.It("validates local ephemeral storage resource limits of pods that are allowed to run [Feature:LocalStorageCapacityIsolation]", func() {
122123

123-
framework.SkipUnlessServerVersionGTE(localStorageVersion, f.ClientSet.Discovery())
124+
e2eskipper.SkipUnlessServerVersionGTE(localStorageVersion, f.ClientSet.Discovery())
124125

125126
nodeMaxAllocatable := int64(0)
126127

‎test/e2e/scheduling/priorities.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import (
4141
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
4242
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
4343
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
44+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
4445
testutils "k8s.io/kubernetes/test/utils"
4546
imageutils "k8s.io/kubernetes/test/utils/image"
4647
)
@@ -158,7 +159,7 @@ var _ = SIGDescribe("SchedulerPriorities [Serial]", func() {
158159

159160
ginkgo.It("Pod should be scheduled to node that don't match the PodAntiAffinity terms", func() {
160161

161-
framework.SkipUnlessNodeCountIsAtLeast(2)
162+
e2eskipper.SkipUnlessNodeCountIsAtLeast(2)
162163

163164
ginkgo.By("Trying to launch a pod with a label to get a node which can launch it.")
164165
pod := runPausePod(f, pausePodConfig{

‎test/e2e/scheduling/ubernetes_lite.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
"k8s.io/kubernetes/test/e2e/framework"
3232
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3333
e2erc "k8s.io/kubernetes/test/e2e/framework/rc"
34+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3435
testutils "k8s.io/kubernetes/test/utils"
3536
imageutils "k8s.io/kubernetes/test/utils/image"
3637
)
@@ -41,14 +42,14 @@ var _ = SIGDescribe("Multi-AZ Clusters", func() {
4142
var err error
4243
image := framework.ServeHostnameImage
4344
ginkgo.BeforeEach(func() {
44-
framework.SkipUnlessProviderIs("gce", "gke", "aws")
45+
e2eskipper.SkipUnlessProviderIs("gce", "gke", "aws")
4546
if zoneCount <= 0 {
4647
zoneCount, err = getZoneCount(f.ClientSet)
4748
framework.ExpectNoError(err)
4849
}
4950
ginkgo.By(fmt.Sprintf("Checking for multi-zone cluster. Zone count = %d", zoneCount))
5051
msg := fmt.Sprintf("Zone count is %d, only run for multi-zone clusters, skipping test", zoneCount)
51-
framework.SkipUnlessAtLeast(zoneCount, 2, msg)
52+
e2eskipper.SkipUnlessAtLeast(zoneCount, 2, msg)
5253
// TODO: SkipUnlessDefaultScheduler() // Non-default schedulers might not spread
5354
})
5455
ginkgo.It("should spread the pods of a service across zones", func() {

‎test/e2e/scheduling/ubernetes_lite_volumes.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3232
"k8s.io/kubernetes/test/e2e/framework/providers/gce"
3333
e2epv "k8s.io/kubernetes/test/e2e/framework/pv"
34+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3435
)
3536

3637
var _ = SIGDescribe("Multi-AZ Cluster Volumes [sig-storage]", func() {
@@ -39,14 +40,14 @@ var _ = SIGDescribe("Multi-AZ Cluster Volumes [sig-storage]", func() {
3940
var err error
4041
image := framework.ServeHostnameImage
4142
ginkgo.BeforeEach(func() {
42-
framework.SkipUnlessProviderIs("gce", "gke")
43+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
4344
if zoneCount <= 0 {
4445
zoneCount, err = getZoneCount(f.ClientSet)
4546
framework.ExpectNoError(err)
4647
}
4748
ginkgo.By(fmt.Sprintf("Checking for multi-zone cluster. Zone count = %d", zoneCount))
4849
msg := fmt.Sprintf("Zone count is %d, only run for multi-zone clusters, skipping test", zoneCount)
49-
framework.SkipUnlessAtLeast(zoneCount, 2, msg)
50+
e2eskipper.SkipUnlessAtLeast(zoneCount, 2, msg)
5051
// TODO: SkipUnlessDefaultScheduler() // Non-default schedulers might not spread
5152
})
5253
ginkgo.It("should schedule pods in the same zones as statically provisioned PVs", func() {

‎test/e2e/servicecatalog/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ go_library(
1717
"//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
1818
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
1919
"//test/e2e/framework:go_default_library",
20+
"//test/e2e/framework/skipper:go_default_library",
2021
"//test/utils/image:go_default_library",
2122
"//vendor/github.com/onsi/ginkgo:go_default_library",
2223
],

‎test/e2e/servicecatalog/podpreset.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
"k8s.io/apimachinery/pkg/watch"
3030
clientset "k8s.io/client-go/kubernetes"
3131
"k8s.io/kubernetes/test/e2e/framework"
32+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3233
imageutils "k8s.io/kubernetes/test/utils/image"
3334

3435
"github.com/onsi/ginkgo"
@@ -41,7 +42,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() {
4142
ginkgo.BeforeEach(func() {
4243
// only run on gce for the time being til we find an easier way to update
4344
// the admission controllers used on the others
44-
framework.SkipUnlessProviderIs("gce")
45+
e2eskipper.SkipUnlessProviderIs("gce")
4546
podClient = f.PodClient()
4647
})
4748

@@ -74,7 +75,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() {
7475

7576
_, err := createPodPreset(f.ClientSet, f.Namespace.Name, pip)
7677
if apierrors.IsNotFound(err) {
77-
framework.Skipf("podpresets requires k8s.io/api/settings/v1alpha1 to be enabled")
78+
e2eskipper.Skipf("podpresets requires k8s.io/api/settings/v1alpha1 to be enabled")
7879
}
7980
framework.ExpectNoError(err)
8081

@@ -192,7 +193,7 @@ var _ = SIGDescribe("[Feature:PodPreset] PodPreset", func() {
192193

193194
_, err := createPodPreset(f.ClientSet, f.Namespace.Name, pip)
194195
if apierrors.IsNotFound(err) {
195-
framework.Skipf("podpresets requires k8s.io/api/settings/v1alpha1 to be enabled")
196+
e2eskipper.Skipf("podpresets requires k8s.io/api/settings/v1alpha1 to be enabled")
196197
}
197198
framework.ExpectNoError(err)
198199

0 commit comments

Comments
 (0)