kubernetes
/
git-sync
mirror of https://github.com/kubernetes/git-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Dump logs when e2e fails in CI

This commit is contained in:
Tim Hockin 2023-09-09 22:34:18 -07:00
parent 310cbaea37
commit 50de3aaeab
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -248,7 +248,7 @@ test: $(BUILD_DIRS)
/bin/sh -c " \ /bin/sh -c " \
./build/test.sh ./... \ ./build/test.sh ./... \
" "
./test_e2e.sh VERBOSE=1 ./test_e2e.sh
TEST_TOOLS := $(shell find _test_tools/* -type d -printf "%f ") TEST_TOOLS := $(shell find _test_tools/* -type d -printf "%f ")
test-tools: $(foreach tool, $(TEST_TOOLS), .container-test_tool.$(tool)) test-tools: $(foreach tool, $(TEST_TOOLS), .container-test_tool.$(tool))

43
test_e2e.sh
View File

@ -3200,21 +3200,17 @@ make container REGISTRY=e2e VERSION="${E2E_TAG}" ALLOW_STALE_APT=1
make test-tools REGISTRY=e2e make test-tools REGISTRY=e2e
function finish() { function finish() {
r=$? r=$?
trap "" INT EXIT ERR trap "" INT EXIT ERR
if [[ $r != 0 ]]; then if [[ $r != 0 ]]; then
echo echo
echo "the directory $DIR was not removed as it contains"\ echo "the directory $DIR was not removed as it contains"\
"log files useful for debugging" "log files useful for debugging"
fi fi
exit $r exit $r
} }
trap finish INT EXIT ERR trap finish INT EXIT ERR
echo
echo "test root is $DIR"
echo
# Run a test function and return its error code. This is needed because POSIX # Run a test function and return its error code. This is needed because POSIX
# dictates that `errexit` does not apply inside a function called in an `if` # dictates that `errexit` does not apply inside a function called in an `if`
# context. But if we don't call it with `if`, then it terminates the whole # context. But if we don't call it with `if`, then it terminates the whole
@ -3254,10 +3250,24 @@ umask 0002
# Mark all repos as safe, to avoid "dubious ownership". # Mark all repos as safe, to avoid "dubious ownership".
git config --global --add safe.directory '*' git config --global --add safe.directory '*'
# Iterate over the chosen tests and run them.
FAILS=() FAILS=()
FINAL_RET=0 FINAL_RET=0
RUNS="${RUNS:-1}" RUNS="${RUNS:-1}"
echo
echo "test root is $DIR"
if (( "${RUNS}" > 1 )); then
echo " RUNS=$RUNS"
fi
if [[ "${CLEANUP:-}" == 0 ]]; then
echo " CLEANUP disabled"
fi
if [[ -n "${VERBOSE:-}" ]]; then
echo " VERBOSE enabled"
fi
echo
# Iterate over the chosen tests and run them.
for t; do for t; do
TEST_RET=0 TEST_RET=0
RUN=0 RUN=0
@ -3286,6 +3296,13 @@ for t; do
if [[ "$RUN_RET" != 42 ]]; then if [[ "$RUN_RET" != 42 ]]; then
echo "FAIL: unknown error" echo "FAIL: unknown error"
fi fi
if [[ -n "${VERBOSE:-}" ]]; then
echo -ne "\n\n"
echo "LOG ----------------------"
cat "${LOG}.${RUN}"
echo "--------------------------"
echo -ne "\n\n"
fi
fi fi
remove_containers || true remove_containers || true
RUN=$((RUN+1)) RUN=$((RUN+1))