Skip to content

Commit

Permalink
Test
Browse files Browse the repository at this point in the history
  • Loading branch information
mbobrovskyi committed Jan 2, 2025
1 parent 7e75e69 commit ce81915
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 16 deletions.
14 changes: 3 additions & 11 deletions Makefile-deps.mk
Original file line number Diff line number Diff line change
Expand Up @@ -127,17 +127,9 @@ kf-training-operator-manifests: ## Copy whole manifests folder from the training

RAY_ROOT = $(shell $(GO_CMD) list -m -mod=readonly -f "{{.Dir}}" github.com/ray-project/kuberay/ray-operator)
.PHONY: ray-operator-crd
ray-operator-crd: ## Copy the whole manifests content from the ray-operator to the dep-crds directory.
## Full version of the manifest is required for e2e multikueue tests.
if [ -d "$(EXTERNAL_CRDS_DIR)/ray-operator" ]; then \
chmod -R u+w "$(EXTERNAL_CRDS_DIR)/ray-operator" && \
rm -rf "$(EXTERNAL_CRDS_DIR)/ray-operator"; \
fi
mkdir -p "$(EXTERNAL_CRDS_DIR)/ray-operator"; \
cp -rf "$(RAY_ROOT)/config/crd" "$(EXTERNAL_CRDS_DIR)/ray-operator"
cp -rf "$(RAY_ROOT)/config/default" "$(EXTERNAL_CRDS_DIR)/ray-operator"
cp -rf "$(RAY_ROOT)/config/rbac" "$(EXTERNAL_CRDS_DIR)/ray-operator"
cp -rf "$(RAY_ROOT)/config/manager" "$(EXTERNAL_CRDS_DIR)/ray-operator"
ray-operator-crd: ## Copy the CRDs from the ray-operator to the dep-crds directory.
mkdir -p $(EXTERNAL_CRDS_DIR)/ray-operator/
cp -f $(RAY_ROOT)/config/crd/bases/* $(EXTERNAL_CRDS_DIR)/ray-operator/

JOBSET_ROOT = $(shell $(GO_CMD) list -m -mod=readonly -f "{{.Dir}}" sigs.k8s.io/jobset)
.PHONY: jobset-operator-crd
Expand Down
1 change: 0 additions & 1 deletion Makefile-test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ test: gotestsum ## Run tests.

.PHONY: test-integration
test-integration: gomod-download envtest ginkgo dep-crds kueuectl ginkgo-top ## Run tests.
ls "$(PROJECT_DIR)/dep-crds/ray-operator/crd/bases"
KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" \
KUEUE_BIN=$(PROJECT_DIR)/bin \
ENVTEST_K8S_VERSION=$(ENVTEST_K8S_VERSION) \
Expand Down
2 changes: 1 addition & 1 deletion test/integration/controller/jobs/raycluster/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var (
ctx context.Context
fwk *framework.Framework
crdPath = filepath.Join("..", "..", "..", "..", "..", "config", "components", "crd", "bases")
rayCrdPath = filepath.Join("..", "..", "..", "..", "..", "dep-crds", "ray-operator", "crd", "bases")
rayCrdPath = filepath.Join("..", "..", "..", "..", "..", "dep-crds", "ray-operator")
)

func TestAPIs(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion test/integration/controller/jobs/rayjob/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ var (
ctx context.Context
fwk *framework.Framework
crdPath = filepath.Join("..", "..", "..", "..", "..", "config", "components", "crd", "bases")
rayCrdPath = filepath.Join("..", "..", "..", "..", "..", "dep-crds", "ray-operator", "crd", "bases")
rayCrdPath = filepath.Join("..", "..", "..", "..", "..", "dep-crds", "ray-operator")
)

func TestAPIs(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion test/integration/multikueue/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func createCluster(setupFnc framework.ManagerSetup, apiFeatureGates ...string) c
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"),
filepath.Join("..", "..", "..", "dep-crds", "ray-operator"),
},
APIServerFeatureGates: apiFeatureGates,
}
Expand Down
2 changes: 1 addition & 1 deletion test/integration/webhook/jobs/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var (
webhookPath = filepath.Join("..", "..", "..", "..", "config", "components", "webhook")
mpiCrdPath = filepath.Join("..", "..", "..", "..", "dep-crds", "mpi-operator")
jobsetCrdPath = filepath.Join("..", "..", "..", "..", "dep-crds", "jobset-operator")
rayCrdPath = filepath.Join("..", "..", "..", "..", "dep-crds", "ray-operator", "crd", "bases")
rayCrdPath = filepath.Join("..", "..", "..", "..", "dep-crds", "ray-operator")
kubeflowCrdPath = filepath.Join("..", "..", "..", "..", "dep-crds", "training-operator-crds")
)

Expand Down

0 comments on commit ce81915

Please sign in to comment.