github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #121880 from borg-land/skip-a-broken-test

Browse Source 
Add kubeup label instead of a feature label
This commit is contained in:
Kubernetes Prow Robot
2023-11-15 00:12:54 +01:00
committed by GitHub
parent 620bc81d97 6aa3002ad2
commit 7b1c378edd
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e/autoscaling/dns_autoscaling.go
View File

@@ -29,7 +29,6 @@ import (
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/test/e2e/feature"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2enode "k8s.io/kubernetes/test/e2e/framework/node"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
@@ -106,7 +105,7 @@ var _ = SIGDescribe("DNS horizontal autoscaling", func() {
// This test is separated because it is slow and need to run serially. // This test is separated because it is slow and need to run serially.
// Will take around 5 minutes to run on a 4 nodes cluster. // Will take around 5 minutes to run on a 4 nodes cluster.
// TODO(upodroid) This test will be removed in 1.33 when kubeup is removed // TODO(upodroid) This test will be removed in 1.33 when kubeup is removed
f.It(f.WithSerial(), f.WithSlow(), feature.KubeUp, "kube-dns-autoscaler should scale kube-dns pods when cluster size changed", func(ctx context.Context) { f.It(f.WithSerial(), f.WithSlow(), f.WithLabel("KubeUp"), "kube-dns-autoscaler should scale kube-dns pods when cluster size changed", func(ctx context.Context) {
numNodes, err := e2enode.TotalRegistered(ctx, c) numNodes, err := e2enode.TotalRegistered(ctx, c)
framework.ExpectNoError(err) framework.ExpectNoError(err)

3
test/e2e/cloud/gcp/restart.go
View File

@@ -88,7 +88,8 @@ var _ = SIGDescribe("Restart", framework.WithDisruptive(), func() {
} }
}) })
ginkgo.It("should restart all nodes and ensure all nodes and pods recover", func(ctx context.Context) { // TODO(upodroid) This test will be removed in 1.33 when kubeup is removed
f.It(f.WithLabel("KubeUp"), "should restart all nodes and ensure all nodes and pods recover", func(ctx context.Context) {
ginkgo.By("restarting all of the nodes") ginkgo.By("restarting all of the nodes")
err := common.RestartNodes(f.ClientSet, originalNodes) err := common.RestartNodes(f.ClientSet, originalNodes)
framework.ExpectNoError(err) framework.ExpectNoError(err)

1
test/e2e/feature/feature.go
View File

@@ -71,7 +71,6 @@ var (
KubeProxyDaemonSetDowngrade = framework.WithFeature(framework.ValidFeatures.Add("KubeProxyDaemonSetDowngrade")) KubeProxyDaemonSetDowngrade = framework.WithFeature(framework.ValidFeatures.Add("KubeProxyDaemonSetDowngrade"))
KubeProxyDaemonSetUpgrade = framework.WithFeature(framework.ValidFeatures.Add("KubeProxyDaemonSetUpgrade")) KubeProxyDaemonSetUpgrade = framework.WithFeature(framework.ValidFeatures.Add("KubeProxyDaemonSetUpgrade"))
KubeProxyDaemonSetMigration = framework.WithFeature(framework.ValidFeatures.Add("KubeProxyDaemonSetMigration")) KubeProxyDaemonSetMigration = framework.WithFeature(framework.ValidFeatures.Add("KubeProxyDaemonSetMigration"))
KubeUp = framework.WithFeature(framework.ValidFeatures.Add("KubeUp"))
LabelSelector = framework.WithFeature(framework.ValidFeatures.Add("LabelSelector")) LabelSelector = framework.WithFeature(framework.ValidFeatures.Add("LabelSelector"))
LocalStorageCapacityIsolation = framework.WithFeature(framework.ValidFeatures.Add("LocalStorageCapacityIsolation")) LocalStorageCapacityIsolation = framework.WithFeature(framework.ValidFeatures.Add("LocalStorageCapacityIsolation"))
LocalStorageCapacityIsolationQuota = framework.WithFeature(framework.ValidFeatures.Add("LocalStorageCapacityIsolationQuota")) LocalStorageCapacityIsolationQuota = framework.WithFeature(framework.ValidFeatures.Add("LocalStorageCapacityIsolationQuota"))