Skip to content

Commit f925413

Browse files
committed
remove more
Signed-off-by: Wantong Jiang <[email protected]>
1 parent 79f779f commit f925413

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

test/e2e/drain_tool_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
toolsutils "github.com/kubefleet-dev/kubefleet/tools/utils"
3636
)
3737

38-
var _ = Describe("Drain cluster successfully", Label("serial"), Ordered, Serial, func() {
38+
var _ = Describe("Drain cluster successfully", Ordered, Serial, func() {
3939
crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
4040
var drainEvictions []placementv1beta1.ClusterResourcePlacementEviction
4141
var drainClusters, noDrainClusters []*framework.Cluster
@@ -120,7 +120,7 @@ var _ = Describe("Drain cluster successfully", Label("serial"), Ordered, Serial,
120120
})
121121
})
122122

123-
var _ = Describe("Drain cluster blocked - ClusterResourcePlacementDisruptionBudget blocks evictions on all clusters", Label("serial"), Ordered, Serial, func() {
123+
var _ = Describe("Drain cluster blocked - ClusterResourcePlacementDisruptionBudget blocks evictions on all clusters", Ordered, Serial, func() {
124124
crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
125125
var drainEvictions []placementv1beta1.ClusterResourcePlacementEviction
126126
var testStartTime time.Time
@@ -203,7 +203,7 @@ var _ = Describe("Drain cluster blocked - ClusterResourcePlacementDisruptionBudg
203203
})
204204
})
205205

206-
var _ = Describe("Drain is allowed on one cluster, blocked on others - ClusterResourcePlacementDisruptionBudget blocks evictions on some clusters", Label("serial"), Ordered, Serial, func() {
206+
var _ = Describe("Drain is allowed on one cluster, blocked on others - ClusterResourcePlacementDisruptionBudget blocks evictions on some clusters", Ordered, Serial, func() {
207207
crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
208208
var drainEvictions []placementv1beta1.ClusterResourcePlacementEviction
209209
var drainClusters, noDrainClusters []*framework.Cluster

test/e2e/placement_eviction_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
testutilseviction "github.com/kubefleet-dev/kubefleet/test/utils/eviction"
3232
)
3333

34-
var _ = Describe("ClusterResourcePlacement eviction of bound binding, taint cluster before eviction - No PDB specified", Label("serial"), Ordered, Serial, func() {
34+
var _ = Describe("ClusterResourcePlacement eviction of bound binding, taint cluster before eviction - No PDB specified", Ordered, Serial, func() {
3535
crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
3636
crpEvictionName := fmt.Sprintf(crpEvictionNameTemplate, GinkgoParallelProcess())
3737
var taintClusterNames, noTaintClusterNames []string
@@ -230,7 +230,7 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickAll C
230230
It("should still place resources on the all available member clusters", checkIfPlacedWorkResourcesOnAllMemberClusters)
231231
})
232232

233-
var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickAll CRP, PDB with MinAvailable specified as Integer to protect resources in all but one cluster, eviction allowed", Label("serial"), Ordered, Serial, func() {
233+
var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickAll CRP, PDB with MinAvailable specified as Integer to protect resources in all but one cluster, eviction allowed", Ordered, Serial, func() {
234234
crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
235235
crpEvictionName := fmt.Sprintf(crpEvictionNameTemplate, GinkgoParallelProcess())
236236
var taintClusterNames, noTaintClusterNames []string
@@ -405,7 +405,7 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP
405405
It("should still place resources on the all available member clusters", checkIfPlacedWorkResourcesOnAllMemberClusters)
406406
})
407407

408-
var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP, PDB with MaxUnavailable specified as Integer to protect resources all clusters but one cluster, eviction allowed", Label("serial"), Ordered, Serial, func() {
408+
var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP, PDB with MaxUnavailable specified as Integer to protect resources all clusters but one cluster, eviction allowed", Ordered, Serial, func() {
409409
crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
410410
crpEvictionName := fmt.Sprintf(crpEvictionNameTemplate, GinkgoParallelProcess())
411411
var taintClusterNames, noTaintClusterNames []string
@@ -511,7 +511,7 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP
511511
})
512512
})
513513

514-
var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP, PDB with MaxUnavailable specified as percentage to protect all clusters but one, eviction allowed", Label("serial"), Ordered, Serial, func() {
514+
var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP, PDB with MaxUnavailable specified as percentage to protect all clusters but one, eviction allowed", Ordered, Serial, func() {
515515
crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
516516
crpEvictionName := fmt.Sprintf(crpEvictionNameTemplate, GinkgoParallelProcess())
517517
var taintClusterNames, noTaintClusterNames []string
@@ -793,7 +793,7 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP
793793
It("should still place resources on the all available member clusters", checkIfPlacedWorkResourcesOnAllMemberClusters)
794794
})
795795

796-
var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP, PDB with MinAvailable specified as Integer to protect resources all clusters but one cluster, eviction allowed", Label("serial"), Ordered, Serial, func() {
796+
var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP, PDB with MinAvailable specified as Integer to protect resources all clusters but one cluster, eviction allowed", Ordered, Serial, func() {
797797
crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
798798
crpEvictionName := fmt.Sprintf(crpEvictionNameTemplate, GinkgoParallelProcess())
799799
var taintClusterNames, noTaintClusterNames []string
@@ -899,7 +899,7 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP
899899
})
900900
})
901901

902-
var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP, PDB with MinAvailable specified as percentage to protect all clusters but one, eviction allowed", Label("serial"), Ordered, Serial, func() {
902+
var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP, PDB with MinAvailable specified as percentage to protect all clusters but one, eviction allowed", Ordered, Serial, func() {
903903
crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
904904
crpEvictionName := fmt.Sprintf(crpEvictionNameTemplate, GinkgoParallelProcess())
905905
var taintClusterNames, noTaintClusterNames []string

test/e2e/taint_toleration_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/kubefleet-dev/kubefleet/test/e2e/framework"
2929
)
3030

31-
var _ = Describe("placing resource using a cluster resource placement with pickFixed placement policy specified, taint clusters, pick all specified clusters", Label("serial"), Serial, Ordered, func() {
31+
var _ = Describe("placing resource using a cluster resource placement with pickFixed placement policy specified, taint clusters, pick all specified clusters", Serial, Ordered, func() {
3232
crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
3333

3434
BeforeAll(func() {
@@ -70,7 +70,7 @@ var _ = Describe("placing resource using a cluster resource placement with pickF
7070
})
7171
})
7272

73-
var _ = Describe("placing resources using a cluster resource placement with no placement policy specified, taint clusters, update cluster resource placement with tolerations", Label("serial"), Serial, Ordered, func() {
73+
var _ = Describe("placing resources using a cluster resource placement with no placement policy specified, taint clusters, update cluster resource placement with tolerations", Serial, Ordered, func() {
7474
crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
7575
var taintClusterNames, noTaintClusterNames []string
7676
var taintClusters, noTaintClusters []*framework.Cluster
@@ -143,7 +143,7 @@ var _ = Describe("placing resources using a cluster resource placement with no p
143143
})
144144
})
145145

146-
var _ = Describe("placing resources using a cluster resource placement with no placement policy specified, taint clusters, remove taints from cluster, all cluster should be picked", Label("serial"), Serial, Ordered, func() {
146+
var _ = Describe("placing resources using a cluster resource placement with no placement policy specified, taint clusters, remove taints from cluster, all cluster should be picked", Serial, Ordered, func() {
147147
crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
148148
var taintClusterNames, noTaintClusterNames []string
149149
var taintClusters, noTaintClusters []*framework.Cluster
@@ -214,7 +214,7 @@ var _ = Describe("placing resources using a cluster resource placement with no p
214214
})
215215
})
216216

217-
var _ = Describe("picking N clusters with affinities and topology spread constraints, taint clusters, create cluster resource placement with toleration for one cluster", Label("serial"), Serial, Ordered, func() {
217+
var _ = Describe("picking N clusters with affinities and topology spread constraints, taint clusters, create cluster resource placement with toleration for one cluster", Serial, Ordered, func() {
218218
crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
219219
var taintClusterNames, tolerateClusterNames, unSelectedClusterNames []string
220220
var tolerateClusters, unSelectedClusters []*framework.Cluster
@@ -311,7 +311,7 @@ var _ = Describe("picking N clusters with affinities and topology spread constra
311311
})
312312
})
313313

314-
var _ = Describe("picking all clusters using pickAll placement policy, add taint to a cluster that's already selected", Label("serial"), Serial, Ordered, func() {
314+
var _ = Describe("picking all clusters using pickAll placement policy, add taint to a cluster that's already selected", Serial, Ordered, func() {
315315
crpName := fmt.Sprintf(crpNameTemplate, GinkgoParallelProcess())
316316
taintClusterNames := []string{memberCluster1EastProdName}
317317

0 commit comments

Comments
 (0)