Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion hack/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,13 @@ ARTIFACT_DIR=${ARTIFACT_DIR:-""}
GINKGO=${GINKGO:-"go run -mod=vendor ${REPO_ROOT}/vendor/github.com/onsi/ginkgo/v2/ginkgo"}
PARALLEL_FLAG="-p"
if [ "${OPENSHIFT_CI:-}" == "true" ]; then
PARALLEL_FLAG="--procs=4"
if [[ "${TEST_DIRS}" == *"e2e"* ]]; then
PARALLEL_FLAG="--procs=4"
else
# Limit parallelism: each Ginkgo process starts its own envtest
# control plane, and higher values cause timeout failures in CI.
PARALLEL_FLAG="--procs=2"
fi
Comment thread
damdo marked this conversation as resolved.
fi
GINKGO_ARGS=${GINKGO_ARGS:-"-r -v ${PARALLEL_FLAG} --randomize-all --randomize-suites --keep-going --race --trace --timeout=${TIMEOUT}"}
GINKGO_EXTRA_ARGS=${GINKGO_EXTRA_ARGS:-""}
Expand Down
2 changes: 1 addition & 1 deletion pkg/controllers/machinesetsync/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import (
)

const (
timeout = 2 * time.Second
timeout = 5 * time.Second
longerTimeout = 10 * time.Second
setupTimeout = 1 * time.Minute
consecutiveFailLimit = 8
Expand Down