test

kubernetes-sigs · Jan 2, 2025 · 867c9d1 · 867c9d1
1 parent 50333bf
commit 867c9d1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 18 deletions.
diff --git a/Makefile-test.mk b/Makefile-test.mk
@@ -39,7 +39,7 @@ ENVTEST_K8S_VERSION ?= 1.31
 # to run without parallelism.
 INTEGRATION_NPROCS ?= 4
 # Folder where the integration tests are located.
-INTEGRATION_TARGET ?= ./test/integration/multikueue/...
+INTEGRATION_TARGET ?= ./test/integration/...
 # Verbosity level for apiserver logging.
 # The logging is disabled if 0.
 INTEGRATION_API_LOG_LEVEL ?= 0

diff --git a/test/integration/controller/jobs/rayjob/suite_test.go b/test/integration/controller/jobs/rayjob/suite_test.go
@@ -58,8 +58,13 @@ func TestAPIs(t *testing.T) {
 
 var _ = ginkgo.BeforeSuite(func() {
 	fwk = &framework.Framework{
-		CRDPath:     crdPath,
-		DepCRDPaths: []string{rayCrdPath},
+		CRDPath: crdPath,
+		DepCRDPaths: []string{
+			filepath.Join("..", "..", "..", "..", "..", "dep-crds", "jobset-operator"),
+			filepath.Join("..", "..", "..", "..", "..", "dep-crds", "training-operator-crds"),
+			filepath.Join("..", "..", "..", "..", "..", "dep-crds", "mpi-operator"),
+			rayCrdPath,
+		},
 	}
 
 	cfg = fwk.Init()

diff --git a/test/integration/multikueue/suite_test.go b/test/integration/multikueue/suite_test.go
@@ -49,7 +49,6 @@ import (
 	workloadtfjob "sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/tfjob"
 	workloadxgboostjob "sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/xgboostjob"
 	workloadmpijob "sigs.k8s.io/kueue/pkg/controller/jobs/mpijob"
-	workloadrayjob "sigs.k8s.io/kueue/pkg/controller/jobs/rayjob"
 	"sigs.k8s.io/kueue/pkg/queue"
 	"sigs.k8s.io/kueue/pkg/util/kubeversion"
 	utiltesting "sigs.k8s.io/kueue/pkg/util/testing"
@@ -93,10 +92,10 @@ func createCluster(setupFnc framework.ManagerSetup, apiFeatureGates ...string) c
 	c.fwk = &framework.Framework{
 		CRDPath:     filepath.Join("..", "..", "..", "config", "components", "crd", "bases"),
 		WebhookPath: filepath.Join("..", "..", "..", "config", "components", "webhook"),
-		DepCRDPaths: []string{filepath.Join("..", "..", "..", "dep-crds", "jobset-operator"),
+		DepCRDPaths: []string{
+			filepath.Join("..", "..", "..", "dep-crds", "jobset-operator"),
 			filepath.Join("..", "..", "..", "dep-crds", "training-operator-crds"),
 			filepath.Join("..", "..", "..", "dep-crds", "mpi-operator"),
-			filepath.Join("..", "..", "..", "dep-crds", "ray-operator", "crd", "bases"),
 		},
 		APIServerFeatureGates: apiFeatureGates,
 	}
@@ -208,18 +207,6 @@ func managerSetup(ctx context.Context, mgr manager.Manager) {
 
 	err = workloadmpijob.SetupMPIJobWebhook(mgr, jobframework.WithCache(cCache), jobframework.WithQueues(queues))
 	gomega.Expect(err).NotTo(gomega.HaveOccurred())
-
-	err = workloadrayjob.SetupIndexes(ctx, mgr.GetFieldIndexer())
-	gomega.Expect(err).NotTo(gomega.HaveOccurred())
-
-	rayJobReconciler := workloadrayjob.NewReconciler(
-		mgr.GetClient(),
-		mgr.GetEventRecorderFor(constants.JobControllerName))
-	err = rayJobReconciler.SetupWithManager(mgr)
-	gomega.Expect(err).NotTo(gomega.HaveOccurred())
-
-	err = workloadrayjob.SetupRayJobWebhook(mgr, jobframework.WithCache(cCache), jobframework.WithQueues(queues))
-	gomega.Expect(err).NotTo(gomega.HaveOccurred())
 }
 
 func managerAndMultiKueueSetup(ctx context.Context, mgr manager.Manager, gcInterval time.Duration, enabledIntegrations sets.Set[string]) {