Skip to content

Add kind cluster support: auto-detect kind and skip incompatible tests #162

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
ajfloeder merged 1 commit into from
Apr 14, 2026
Merged

Add kind cluster support: auto-detect kind and skip incompatible tests #162

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
24 changes: 22 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ endif
export PATH := $(HOME)/go/bin:$(PATH)

# Base command to start the tests with ginkgo
GINKGO_RUN?=CGO_ENABLED=0 ginkgo run ${PARALLEL_OPT} --v
GINKGO_RUN?=CGO_ENABLED=0 ginkgo run ${PARALLEL_OPT} --v --fail-fast

all: fmt vet

Expand All @@ -22,9 +22,19 @@ vet:
go vet ./...

# TODO: would be nice to tie this to a script that also deletes all the workflows and makes sure nothing is left over
# Clean up resources that may be left behind by interrupted test runs
.PHONY: clean
clean:
@echo "Removing triage namespace..."
kubectl delete namespace nnf-system-needs-triage --ignore-not-found
@echo "Removing leftover UID verification pods..."
kubectl delete pods -n default --ignore-not-found $$(kubectl get pods -n default --no-headers -o custom-columns=':metadata.name' 2>/dev/null | grep '^verify-uid-') 2>/dev/null; true
@echo "Checking for persistent storage instances..."
@psi=$$(kubectl get persistentstorageinstances -A --no-headers 2>/dev/null); \
if [ -n "$$psi" ]; then \
echo "WARNING: Persistent storage instances still exist. These require a destroy_persistent workflow to remove:" >&2; \
echo "$$psi" >&2; \
fi

.PHONY: init
init:
Expand All @@ -33,12 +43,22 @@ init:
# Run all the tests
.PHONY: test
test:
${GINKGO_RUN} .
@if kubectl config current-context 2>/dev/null | grep -q 'kind-'; then \
echo "Detected kind cluster. Switching to 'make kind' (excludes global-lustre tests)." >&2; \
$(MAKE) kind; \
else \
${GINKGO_RUN} . ; \
fi

# Alias for all the tests
.PHONY: full
full: test

# Run tests compatible with a kind environment (excludes tests requiring real Lustre mounts)
.PHONY: kind
kind:
${GINKGO_RUN} --label-filter='!global-lustre && !multi-storage && !lustre-csimount && !high-capacity' .

# Run one test to ensure system is in working order
.PHONY: sanity
sanity:
Expand Down
9 changes: 5 additions & 4 deletions int_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,8 @@ var tests = []*T{
// WithStorageProfile().DelayInState(dwsv1alpha7.StateDataIn, 15*time.Second).StopAfter(dwsv1alpha7.StatePreRun).Focused(),
MakeTest("XFS with Storage Profile and LV Create",
"#DW jobdw type=xfs name=xfs-storage-profile capacity=14TB profile=my-xfs-storage-profile").
WithStorageProfileLvCreate("--zero n --activate y --type raid5 --nosync --extents $PERCENT_VG --stripes $DEVICE_NUM-1 --stripesize=64KiB --name $LV_NAME $VG_NAME"),
WithStorageProfileLvCreate("--zero n --activate y --type raid5 --nosync --extents $PERCENT_VG --stripes $DEVICE_NUM-1 --stripesize=64KiB --name $LV_NAME $VG_NAME").
WithLabels("high-capacity"),

// Persistent
MakeTest("Persistent Lustre",
Expand Down Expand Up @@ -150,7 +151,7 @@ var tests = []*T{
"#DW jobdw type=lustre name=lustre-with-containers-mpi capacity=100GB",
"#DW container name=lustre-with-containers-mpi profile=example-mpi "+
"DW_JOB_foo_local_storage=lustre-with-containers-mpi").
WithPermissions(userID, groupID).WithLabels("mpi"),
WithPermissions(userID, groupID).WithLabels("mpi", "lustre-csimount"),
MakeTest("GFS2 and Global Lustre with MPI Containers",
"#DW jobdw type=gfs2 name=gfs2-and-global-with-containers-mpi capacity=100GB",
"#DW container name=gfs2-and-global-with-containers-mpi profile=example-mpi "+
Expand Down Expand Up @@ -217,15 +218,15 @@ var tests = []*T{
WithContainerProfile("example-fail", &ContainerProfileOptions{RetryLimit: pointy.Int(0)}).
ExpectError(dwsv1alpha7.StatePostRun),

// Containers - Unsupported Filesystems. These should fail as xfs/raw filesystems are not supported for containers.
// Containers - Unsupported Filesystems. XFS is not supported for containers.
MakeTest("XFS with Containers",
"#DW jobdw type=xfs name=xfs-with-containers capacity=100GB",
"#DW container name=xfs-with-containers profile=example-success DW_JOB_foo_local_storage=xfs-with-containers").
ExpectError(dwsv1alpha7.StateProposal).WithLabels("unsupported-fs"),
MakeTest("Raw with Containers",
"#DW jobdw type=raw name=raw-with-containers capacity=100GB",
"#DW container name=raw-with-containers profile=example-success DW_JOB_foo_local_storage=raw-with-containers").
ExpectError(dwsv1alpha7.StateProposal).WithLabels("unsupported-fs"),
WithPermissions(userID, groupID).WithLabels("non-mpi"),

// Containers - Multiple Storages
MakeTest("GFS2 and Lustre with Containers",
Expand Down
Loading