From c64b12df0e47731b35fb555530a946f1c6fc5764 Mon Sep 17 00:00:00 2001 From: Michal Szadkowski Date: Tue, 7 Jan 2025 09:49:53 +0100 Subject: [PATCH] Testing --- Makefile-test.mk | 4 ++-- test/integration/framework/framework.go | 2 +- test/integration/multikueue/suite_test.go | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile-test.mk b/Makefile-test.mk index 14781bb0a5..bd78ed44d1 100644 --- a/Makefile-test.mk +++ b/Makefile-test.mk @@ -42,7 +42,7 @@ INTEGRATION_NPROCS ?= 4 INTEGRATION_TARGET ?= ./test/integration/... # Verbosity level for apiserver logging. # The logging is disabled if 0. -INTEGRATION_API_LOG_LEVEL ?= 0 +INTEGRATION_API_LOG_LEVEL ?= 1 # Integration filters INTEGRATION_RUN_ALL?=true ifneq ($(INTEGRATION_RUN_ALL),true) @@ -83,7 +83,7 @@ test-integration: gomod-download envtest ginkgo dep-crds kueuectl ginkgo-top ## KUEUE_BIN=$(PROJECT_DIR)/bin \ ENVTEST_K8S_VERSION=$(ENVTEST_K8S_VERSION) \ API_LOG_LEVEL=$(INTEGRATION_API_LOG_LEVEL) \ - $(GINKGO) $(INTEGRATION_FILTERS) $(GINKGO_ARGS) -procs=$(INTEGRATION_NPROCS) --race --junit-report=junit.xml --json-report=integration.json --output-dir=$(ARTIFACTS) -v $(INTEGRATION_TARGET) + $(GINKGO) $(INTEGRATION_FILTERS) $(GINKGO_ARGS) -procs=$(INTEGRATION_NPROCS) --output-interceptor-mode=none --race --junit-report=junit.xml --json-report=integration.json --output-dir=$(ARTIFACTS) -v $(INTEGRATION_TARGET) $(PROJECT_DIR)/bin/ginkgo-top -i $(ARTIFACTS)/integration.json > $(ARTIFACTS)/integration-top.yaml CREATE_KIND_CLUSTER ?= true diff --git a/test/integration/framework/framework.go b/test/integration/framework/framework.go index 7ad49b5a6e..ce215871d3 100644 --- a/test/integration/framework/framework.go +++ b/test/integration/framework/framework.go @@ -96,7 +96,7 @@ func (f *Framework) Init() *rest.Config { var err error cfg, err = f.testEnv.Start() - gomega.ExpectWithOffset(1, err).NotTo(gomega.HaveOccurred()) + gomega.ExpectWithOffset(1, err).NotTo(gomega.HaveOccurred(), fmt.Sprintf("Failed to setup envtest: %v", err)) gomega.ExpectWithOffset(1, cfg).NotTo(gomega.BeNil()) }) f.scheme = runtime.NewScheme() diff --git a/test/integration/multikueue/suite_test.go b/test/integration/multikueue/suite_test.go index 6425fab0dd..234989b4e0 100644 --- a/test/integration/multikueue/suite_test.go +++ b/test/integration/multikueue/suite_test.go @@ -92,9 +92,11 @@ 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"), }, APIServerFeatureGates: apiFeatureGates, }