Skip to content

Commit

Permalink
[Fix][Envtest] Decorate container nodes with Ordered (#2285)
Browse files Browse the repository at this point in the history
  • Loading branch information
MortalHappiness authored Aug 5, 2024
1 parent 799f073 commit dea87ff
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions ray-operator/controllers/ray/raycluster_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func rayClusterTemplate(name string, namespace string) *rayv1.RayCluster {
}

var _ = Context("Inside the default namespace", func() {
Describe("Static RayCluster", func() {
Describe("Static RayCluster", Ordered, func() {
ctx := context.Background()
namespace := "default"
rayCluster := rayClusterTemplate("raycluster-static", namespace)
Expand Down Expand Up @@ -227,7 +227,7 @@ var _ = Context("Inside the default namespace", func() {
})
})

Describe("RayCluster with overridden app.kubernetes.io labels", func() {
Describe("RayCluster with overridden app.kubernetes.io labels", Ordered, func() {
ctx := context.Background()
namespace := "default"
rayCluster := rayClusterTemplate("raycluster-overridden-k8s-labels", namespace)
Expand Down Expand Up @@ -321,7 +321,7 @@ var _ = Context("Inside the default namespace", func() {
})
})

Describe("RayCluster with autoscaling enabled", func() {
Describe("RayCluster with autoscaling enabled", Ordered, func() {
ctx := context.Background()
namespace := "default"
rayCluster := rayClusterTemplate("raycluster-autoscaler", namespace)
Expand Down Expand Up @@ -414,7 +414,7 @@ var _ = Context("Inside the default namespace", func() {
})
})

Describe("Suspend RayCluster", func() {
Describe("Suspend RayCluster", Ordered, func() {
ctx := context.Background()
namespace := "default"
rayCluster := rayClusterTemplate("raycluster-suspend", namespace)
Expand Down Expand Up @@ -576,7 +576,7 @@ var _ = Context("Inside the default namespace", func() {
})
})

Describe("RayCluster with a multi-host worker group", func() {
Describe("RayCluster with a multi-host worker group", Ordered, func() {
ctx := context.Background()
namespace := "default"
rayCluster := rayClusterTemplate("raycluster-multihost", namespace)
Expand Down Expand Up @@ -670,7 +670,7 @@ var _ = Context("Inside the default namespace", func() {
})
})

Describe("RayCluster with PodTemplate referencing a different namespace", func() {
Describe("RayCluster with PodTemplate referencing a different namespace", Ordered, func() {
ctx := context.Background()
namespace := "default"
rayCluster := rayClusterTemplate("raycluster-podtemplate-namespace", namespace)
Expand Down Expand Up @@ -704,7 +704,7 @@ var _ = Context("Inside the default namespace", func() {
})
})

Describe("RayCluster without resource request", func() {
Describe("RayCluster without resource request", Ordered, func() {
ctx := context.Background()
namespace := "default"
rayCluster := rayClusterTemplate("no-resource-req", namespace)
Expand Down Expand Up @@ -789,7 +789,7 @@ var _ = Context("Inside the default namespace", func() {
})
})

Describe("RayCluster with invalid NumOfHosts", func() {
Describe("RayCluster with invalid NumOfHosts", Ordered, func() {
// Some users only upgrade the KubeRay image without upgrading the CRD. For example, when a
// user upgrades the KubeRay operator from v1.0.0 to v1.1.0 without upgrading the CRD, the
// KubeRay operator will use the zero value of `NumOfHosts` in the CRD. Hence, all worker
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
)

var _ = Context("RayJob with suspend operation", func() {
Describe("When creating a rayjob with suspend == true", func() {
Describe("When creating a rayjob with suspend == true", Ordered, func() {
ctx := context.Background()
namespace := "default"
rayCluster := &rayv1.RayCluster{}
Expand Down Expand Up @@ -102,7 +102,7 @@ var _ = Context("RayJob with suspend operation", func() {
})
})

Describe("RayJob suspend operation shoud be atomic", func() {
Describe("RayJob suspend operation shoud be atomic", Ordered, func() {
ctx := context.Background()
namespace := "default"
rayJob := rayJobTemplate("rayjob-atomic-suspend", namespace)
Expand Down
10 changes: 5 additions & 5 deletions ray-operator/controllers/ray/rayjob_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func rayJobTemplate(name string, namespace string) *rayv1.RayJob {
}

var _ = Context("RayJob in K8sJobMode", func() {
Describe("RayJob SubmitterConfig BackoffLimit", func() {
Describe("RayJob SubmitterConfig BackoffLimit", Ordered, func() {
ctx := context.Background()
namespace := "default"
rayJobWithDefaultSubmitterConfigBackoffLimit := rayJobTemplate("rayjob-default", namespace)
Expand Down Expand Up @@ -186,7 +186,7 @@ var _ = Context("RayJob in K8sJobMode", func() {
})
})

Describe("Successful RayJob in K8sJobMode", func() {
Describe("Successful RayJob in K8sJobMode", Ordered, func() {
ctx := context.Background()
namespace := "default"
rayJob := rayJobTemplate("rayjob-test", namespace)
Expand Down Expand Up @@ -311,7 +311,7 @@ var _ = Context("RayJob in K8sJobMode", func() {
})
})

Describe("Successful RayJob in K8sjobMode with DELETE_RAYJOB_CR_AFTER_JOB_FINISHES", func() {
Describe("Successful RayJob in K8sjobMode with DELETE_RAYJOB_CR_AFTER_JOB_FINISHES", Ordered, func() {
ctx := context.Background()
namespace := "default"
rayJob := rayJobTemplate("rayjob-test-delete", namespace)
Expand Down Expand Up @@ -432,7 +432,7 @@ var _ = Context("RayJob in K8sJobMode", func() {
})
})

Describe("RayJob has passed the ActiveDeadlineSeconds", func() {
Describe("RayJob has passed the ActiveDeadlineSeconds", Ordered, func() {
ctx := context.Background()
namespace := "default"
activeDeadlineSeconds := int32(3)
Expand Down Expand Up @@ -475,7 +475,7 @@ var _ = Context("RayJob in K8sJobMode", func() {
})
})

Describe("Retrying RayJob in K8sJobMode", func() {
Describe("Retrying RayJob in K8sJobMode", Ordered, func() {
ctx := context.Background()
namespace := "default"
rayJob := rayJobTemplate("rayjob-retry-test", namespace)
Expand Down
2 changes: 1 addition & 1 deletion ray-operator/controllers/ray/rayservice_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ var _ = Context("Inside the default namespace", func() {

myRayCluster := &rayv1.RayCluster{}

Describe("When creating a rayservice", func() {
Describe("When creating a rayservice", Ordered, func() {
It("should create a rayservice object", func() {
err := k8sClient.Create(ctx, myRayService)
Expect(err).NotTo(HaveOccurred(), "failed to create test RayService resource")
Expand Down

0 comments on commit dea87ff

Please sign in to comment.