diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-09-04 00:29:05 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-09-04 00:34:56 -0400 |
| commit | 494fd3339819582668efd5a07b8bd3cd731e09b3 (patch) | |
| tree | 2e9cef1a608eee5ef498b05c7bddaa1d900b56fa | |
| parent | 2c04437d6d8ee38c254c2b683e838e4f30bb8d9c (diff) | |
ci: Add some better logging to test-git-branch.sh
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | ci/_test-git-branch.sh | 17 | ||||
| -rwxr-xr-x | ci/get-test-job.sh | 2 |
2 files changed, 14 insertions, 5 deletions
diff --git a/ci/_test-git-branch.sh b/ci/_test-git-branch.sh index 764870f..59094ac 100644 --- a/ci/_test-git-branch.sh +++ b/ci/_test-git-branch.sh @@ -4,6 +4,8 @@ set -o nounset set -o errexit set -o errtrace +ktest_verbose=0 + KTEST_DIR=$(dirname "$(readlink -e "$0")")/.. JOBSERVER_LINUX_REPO=ssh://$JOBSERVER/$JOBSERVER_HOME/linux @@ -53,12 +55,13 @@ fi echo "Running test $TEST_NAME for branch $BRANCH and commit $COMMIT" -sync_git_repos -git_fetch linux $COMMIT -git checkout FETCH_HEAD +run_quiet "Syncing git repos" sync_git_repos + +run_quiet "Fetching $COMMIT" git_fetch linux $COMMIT +run_quiet "Checking out $COMMIT" git checkout FETCH_HEAD -git_fetch linux ci-monkeypatch -git merge --no-edit FETCH_HEAD || git reset --hard +run_quiet "Fetching ci-monkeypatch" git_fetch linux ci-monkeypatch +run_quiet "Merging ci-monkeypatch" git merge --no-edit FETCH_HEAD || git reset --hard rm -rf ktest-out/out mkdir -p ktest-out/out @@ -82,6 +85,8 @@ while (( ${#SUBTESTS[@]} )); do "ktest-out/out/$TEST_NAME.$FNAME/full_log.br" done + echo "Running test $TEST_NAME ${SUBTESTS[@]}" + $KTEST_DIR/lib/supervisor -T 1200 -f "$FULL_LOG" -S -F \ -b $TEST_NAME -o ktest-out/out \ -- build-test-kernel run $TEST_PATH ${SUBTESTS[@]} > /dev/null & @@ -100,11 +105,13 @@ while (( ${#SUBTESTS[@]} )); do SUBTESTS=( "${SUBTESTS_REMAINING[@]}" ) done +echo "Compressing output" find ktest-out/out -type f -name \*log -print0|xargs -0 brotli --rm -9 OUTPUT=$JOBSERVER_OUTPUT_DIR/c/$COMMIT ssh $JOBSERVER mkdir -p $OUTPUT +echo "Sending results to jobserver" (cd ktest-out/out; tar --create --file - *)| ssh $JOBSERVER "(cd $OUTPUT; tar --extract --file -)" diff --git a/ci/get-test-job.sh b/ci/get-test-job.sh index 8b0e2a9..bf64c6b 100755 --- a/ci/get-test-job.sh +++ b/ci/get-test-job.sh @@ -11,8 +11,10 @@ if [[ ! -f stale-job-cleanup ]]; then fi if [[ $(find stale-job-cleanup -mmin +5) ]]; then + echo -n "Cleaning stale jobs.. " >&2 find -size 0 -cmin +180 |xargs rm -f > /dev/null touch stale-job-cleanup + echo " done" >&2 fi cd $JOBSERVER_HOME/linux |