Skip to content

Migrate container management tests to new test support. #1844

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

Open
jglogan wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Migrate container management tests to new test support. #1844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72790da
Migrates CLI create and run-lifecycle tests.
jglogan Jun 27, 2026
46d9e33
Migrates CLI create, exec, remove tests.
jglogan Jun 27, 2026
93ac728
Migrate container prune and stats.
jglogan Jun 27, 2026
0ff39ee
Migrate container copy tests.
jglogan Jun 27, 2026
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
30 changes: 17 additions & 13 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,15 +199,25 @@ endef
# concurrent pass. WARMUP_FILTER, CONCURRENT_FILTER, and GLOBAL_FILTER select
# the three phases. Expand the filter lists as suites are migrated from CLITests.
PARALLEL_WIDTH ?= 2
WARMUP_FILTER = ImageWarmup
WARMUP_FILTER = ImageWarmup/

CONCURRENT_TEST_SUITES ?= \
TestCLIStop \
TestCLIRmRaceCondition \
TestCLIExportCommand
TestCLIStop/ \
TestCLIRmRaceCondition/ \
TestCLIExportCommand/ \
TestCLICreateCommand/ \
TestCLIRunLifecycle/ \
TestCLIRemove/ \
TestCLIExecCommand/ \
TestCLIStatsCommand/ \
TestCLICopyCommand/
CONCURRENT_FILTER = $(subst $(space),|,$(strip $(CONCURRENT_TEST_SUITES)))

GLOBAL_FILTER = DemoGlobalTests
GLOBAL_TEST_SUITES ?= \
TestCLIRunLifecycleSerial/ \
TestCLIRemoveSerial/ \
TestCLIPruneCommandSerial/
GLOBAL_FILTER = $(subst $(space),|,$(strip $(GLOBAL_TEST_SUITES)))

INTEGRATION_SWIFT_EXTRA ?=
INTEGRATION_POST_TEST ?=
Expand Down Expand Up @@ -237,7 +247,7 @@ define RUN_INTEGRATION
echo "==> Concurrent pass (width=$(PARALLEL_WIDTH))" && \
$(SWIFT) test $(INTEGRATION_SWIFT_EXTRA) -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --experimental-maximum-parallelization-width $(PARALLEL_WIDTH) --filter "$(CONCURRENT_FILTER)" && \
echo "==> Global pass (serial)" && \
$(SWIFT) test $(INTEGRATION_SWIFT_EXTRA) -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --filter "$(GLOBAL_FILTER)" ; \
$(SWIFT) test $(INTEGRATION_SWIFT_EXTRA) -c $(BUILD_CONFIGURATION) $(SWIFT_CONFIGURATION) --experimental-maximum-parallelization-width 1 --filter "$(GLOBAL_FILTER)" ; \
exit_code=$$? ; \
$(INTEGRATION_POST_TEST) \
echo Ensuring apiserver stopped after the CLI integration tests ; \
Expand All @@ -262,16 +272,11 @@ INTEGRATION_TEST_SUITES ?= \
TestCLIStatus \
TestCLIVersion \
TestCLINetwork \
TestCLIRunLifecycle \
TestCLIRunCapabilities \
TestCLIExecCommand \
TestCLICreateCommand \
TestCLIRunCommand1 \
TestCLIRunCommand2 \
TestCLIRunCommand3 \
TestCLIPruneCommand \
TestCLIRegistry \
TestCLIStatsCommand \
TestCLIImagesCommand \
TestCLIRunBase \
TestCLIRunInitImage \
Expand All @@ -283,8 +288,7 @@ INTEGRATION_TEST_SUITES ?= \
TestCLISystemDF \
TestCLIMachineCommand \
TestCLIMachineRuntime \
TestCLINoParallelCases \
TestCLICopyCommand
TestCLINoParallelCases

empty :=
space := $(empty) $(empty)
Expand Down
Loading