Skip to content

Sync envtest optimization across all operators #678

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Feb 12, 2026
+14 −1
Merged

Sync envtest optimization across all operators #678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/functional/base_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
)

const (
timeout = 20 * time.Second
timeout = 45 * time.Second
interval = 20 * time.Millisecond
DatabaseHostname = "databasehost.example.org"
DatabaseInstance = "openstack"
Expand Down
13 changes: 13 additions & 0 deletions test/functional/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"context"
"path/filepath"
"testing"
"time"

"github.com/go-logr/logr"
"github.com/google/uuid"
Expand Down Expand Up @@ -111,6 +112,10 @@ var _ = BeforeSuite(func() {

By("bootstrapping test environment")
testEnv = &envtest.Environment{
// 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,
CRDDirectoryPaths: []string{
filepath.Join("..", "..", "config", "crd", "bases"),
keystoneCRDs,
Expand All @@ -126,6 +131,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.
Expand Down