DNM

Author: stuggi

Makefile

@@ -143,13 +143,19 @@ golangci-lint:
 	test -s $(LOCALBIN)/golangci-lint || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s $(GOLANGCI_LINT_VERSION)
 	$(LOCALBIN)/golangci-lint run --fix
 
-PROCS?=$(shell expr $(shell nproc --ignore 2) / 2)
+#PROCS?=$(shell expr $(shell nproc --ignore 2) / 2)
+PROCS = 1
 PROC_CMD = --procs ${PROCS}
+override GOMAXPROCS = 2
+override GOMEMLIMIT = 2000MiB
+GINKGO_ARGS ?= -v --poll-progress-after=60s --poll-progress-interval=10s
 
 .PHONY: test
 test: manifests generate fmt vet envtest ginkgo ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) -v debug --bin-dir $(LOCALBIN) use $(ENVTEST_K8S_VERSION) -p path)" \
 	OPERATOR_TEMPLATES="$(PWD)/templates" \
+	GOMAXPROCS=$(GOMAXPROCS) \
+	GOMEMLIMIT=$(GOMEMLIMIT) \
 	$(GINKGO) --trace --cover --coverpkg=../../internal/...,../../api/v1beta1 --coverprofile cover.out --covermode=atomic --randomize-all ${PROC_CMD} $(GINKGO_ARGS) ./test/...
 
 ##@ Build

test/functional/base_test.go

@@ -43,7 +43,7 @@ import (
 const (
 	SecretName     = "external-secret"
 	ContainerImage = "test://nova"
-	timeout        = 25 * time.Second
+	timeout        = 45 * time.Second
 	// have maximum 100 retries before the timeout hits
 	interval = timeout / 100
 	// consistencyTimeout is the amount of time we use to repeatedly check

test/functional/suite_test.go

@@ -97,6 +97,8 @@ var _ = BeforeSuite(func() {
 	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true), func(o *zap.Options) {
 		o.Development = true
 		o.TimeEncoder = zapcore.ISO8601TimeEncoder
+		// ADD THIS LINE to silence Info/Debug:
+		o.Level = zapcore.ErrorLevel
 	}))
 
 	ctx, cancel = context.WithCancel(context.TODO())
@@ -127,6 +129,10 @@ var _ = BeforeSuite(func() {
 			keystoneCRDs,
 			rabbitCRDs,
 		},
+		// Increase this to 60 or 120 seconds for the single-core run
+		ControlPlaneStartTimeout: 120 * time.Second,
+		// Give it plenty of time to wind down (e.g., 60-120 seconds)
+		ControlPlaneStopTimeout: 120 * time.Second,
 		CRDInstallOptions: envtest.CRDInstallOptions{
 			Paths: []string{
 				networkv1CRD,
@@ -140,6 +146,14 @@ var _ = BeforeSuite(func() {
 			// failing on the colons in ::1
 			LocalServingHost: "127.0.0.1",
 		},
+		ControlPlane: envtest.ControlPlane{
+			APIServer: &envtest.APIServer{
+				Args: []string{
+					"--service-cluster-ip-range=10.0.0.0/12", // 65k+ IPs
+					"--disable-admission-plugins=ResourceQuota,ServiceAccount,NamespaceLifecycle",
+				},
+			},
+		},
 	}
 
 	// cfg is defined in this file globally.