Skip to content

Commit 157bacf

Browse files
Make test suites run sequentially with respect to other test suites (#200)
Right now swift testing does not have finer grain test parallelization controls. As a result our easy options are either to have ALL tests in ALL test suites run sequentially or have tests within a given test suite run sequentially while other test suites are run at the same time. This has been problematic for our CI since we opted for the second option above, where, for examples, the tests in the builder test suite run sequentially, but the builder test suite runs at the same time as the container run test suite. When this happens, a lot of different tests try to pull the necessary images for testing at the same time, causing some tests to timeout. Signed-off-by: Kathryn Baldauf <k_baldauf@apple.com>
1 parent 009ce93 commit 157bacf

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,12 @@ integration: init-block
143143
@echo "Removing any existing containers"
144144
@bin/container rm --all
145145
@echo "Starting CLI integration tests"
146-
@RUN_CLI_INTEGRATION_TESTS=1 $(SWIFT) test -c $(BUILD_CONFIGURATION) $(CURRENT_SDK_ARGS) --filter TestCLI
146+
@$(SWIFT) test -c $(BUILD_CONFIGURATION) $(CURRENT_SDK_ARGS) --filter TestCLIRunLifecycle
147+
@$(SWIFT) test -c $(BUILD_CONFIGURATION) $(CURRENT_SDK_ARGS) --filter TestCLIExecCommand
148+
@$(SWIFT) test -c $(BUILD_CONFIGURATION) $(CURRENT_SDK_ARGS) --filter TestCLIRunCommand
149+
@$(SWIFT) test -c $(BUILD_CONFIGURATION) $(CURRENT_SDK_ARGS) --filter TestCLIImagesCommand
150+
@$(SWIFT) test -c $(BUILD_CONFIGURATION) $(CURRENT_SDK_ARGS) --filter TestCLIRunBase
151+
@$(SWIFT) test -c $(BUILD_CONFIGURATION) $(CURRENT_SDK_ARGS) --filter TestCLIBuildBase
147152
@echo Ensuring apiserver stopped after the CLI integration tests...
148153
@scripts/ensure-container-stopped.sh
149154

0 commit comments

Comments
 (0)