beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #46178 from vvoland/hack-integrationcli-dont-failfast-23

Browse source 
[23.0 backport] hack/test: Don't fail-fast before integration-cli
This commit is contained in:
Sebastiaan van Stijn 2023-08-09 15:39:10 +02:00 committed by GitHub
commit 2f917915c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
hack/make/.integration-test-helpers
View file

@ -55,11 +55,23 @@ fi
run_test_integration() {
set_platform_timeout
local failed=0
if [ -z "${TEST_SKIP_INTEGRATION}" ]; then
run_test_integration_suites "${integration_api_dirs}"
if ! run_test_integration_suites "${integration_api_dirs}"; then
if [ -n "${TEST_INTEGRATION_FAIL_FAST}" ]; then
return 1
fi
failed=1
fi
fi
if [ -z "${TEST_SKIP_INTEGRATION_CLI}" ]; then
TIMEOUT=360m run_test_integration_suites integration-cli
if ! TIMEOUT=360m run_test_integration_suites integration-cli; then
return 1
fi
fi
if [ $failed -eq 1 ]; then
return 1
fi
}
@ -99,13 +111,13 @@ run_test_integration_suites() {
-- go tool test2json -p "${pkgname}" -t ./test.main ${pkgtestflags}
); then
if [ -n "${TEST_INTEGRATION_FAIL_FAST}" ]; then
exit 1
return 1
fi
failed=1
fi
done
if [ $failed -eq 1 ]; then
exit 1
return 1
fi
}