diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-07-04 12:13:47 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-07-04 12:44:04 -0400 |
| commit | f26d6ea867bd4746d033cfa25c9f2324602fd3dd (patch) | |
| tree | 6d52198ed79174dc103223fef7c6c51c29fb9c4e | |
| parent | 84154174e21ed60625de09f2d5401b42bfce37a9 (diff) | |
ci/test-job-done.sh: New git log code in bash
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | ci/_test-git-branch.sh | 4 | ||||
| -rwxr-xr-x | ci/test-job-done.sh | 68 |
2 files changed, 66 insertions, 6 deletions
diff --git a/ci/_test-git-branch.sh b/ci/_test-git-branch.sh index b210f0b..da423f7 100644 --- a/ci/_test-git-branch.sh +++ b/ci/_test-git-branch.sh @@ -24,6 +24,8 @@ sync_git_repos() } while true; do + echo "Getting test job" + TEST_JOB=( $(ssh $JOBSERVER get-test-job.sh) ) BRANCH=${TEST_JOB[0]} @@ -69,6 +71,8 @@ while true; do brotli --rm -9 "$log" done + brotli --rm -9 ktest-out/out/$TEST_NAME + OUTPUT=$JOBSERVER_OUTPUT_DIR/c/$COMMIT ssh $JOBSERVER mkdir -p $OUTPUT scp -r ktest-out/out/* $JOBSERVER:$OUTPUT diff --git a/ci/test-job-done.sh b/ci/test-job-done.sh index 33aa620..adc05bd 100755 --- a/ci/test-job-done.sh +++ b/ci/test-job-done.sh @@ -19,18 +19,74 @@ set +e STATUSES=$(find "$OUTPUT" -name status) if [[ -n $STATUSES ]]; then - grep -c PASSED $STATUSES > $OUTPUT/nr_passed - grep -c FAILED $STATUSES > $OUTPUT/nr_failed - grep -c NOTRUN $STATUSES > $OUTPUT/nr_notrun - grep -c "NOT STARTED" $STATUSES > $OUTPUT/nr_notstarted - grep -cvE '(PASSED|FAILED|NOTRUN)' $STATUSES > $OUTPUT/nr_unknown + cat $STATUSES|grep -c PASSED > $OUTPUT/nr_passed + cat $STATUSES|grep -c FAILED > $OUTPUT/nr_failed + cat $STATUSES|grep -c NOTRUN > $OUTPUT/nr_notrun + cat $STATUSES|grep -c "NOT STARTED" > $OUTPUT/nr_notstarted + cat $STATUSES|grep -cvE '(PASSED|FAILED|NOTRUN)' > $OUTPUT/nr_unknown echo $STATUSES|wc -w > $OUTPUT/nr_tests fi set -o errexit -echo "Running test2web" +#echo "Running test2web" #test2web "$COMMITTEXT" "$OUTPUT" > "$OUTPUT"/index.html +git_commit_html() +{ + echo '<!DOCTYPE HTML>' + echo "<html><head><title>$(git log -n1 --pretty=format:%s)</title></head>" + echo '<link href="../../bootstrap.min.css" rel="stylesheet">' + + echo '<body>' + echo '<div class="container">' + + + echo '<table class="table">' + + echo "<tr>" + echo "<th>$(git log -n1 --pretty=format:%s)</th>" + echo "</tr>" + + for STATUS in $(find $OUTPUT -name status); do + TESTNAME=$(basename $(dirname $STATUS)) + TESTFILE=$(echo $TESTNAME|cut -d. -f1) + STATUSMSG=Unknown + TABLECLASS=table-secondary + + case $(<$STATUS) in + *PASSED*) + STATUSMSG=Passed + TABLECLASS=table-success + ;; + *FAILED*) + STATUSMSG=Failed + TABLECLASS=table-danger + ;; + *NOTRUN*) + STATUSMSG=Not Run + ;; + *"NOT STARTED"*) + STATUSMSG="Not Started" + ;; + esac + + echo "<tr class=$TABLECLASS>" + echo "<td> $TESTNAME </td>" + echo "<td> $STATUSMSG </td>" + echo "<td> <a href=$TESTNAME/log.br> log </a> </td>" + echo "<td> <a href=$TESTFILE.br> full log </a> </td>" + echo "<td> <a href=$TESTNAME> output directory </a> </td>" + echo "</tr>" + done + + echo "</table>" + echo "</div>" + echo "</body>" + echo "</html>" +} + +git_commit_html > $OUTPUT/index.html + git_log_html() { echo '<!DOCTYPE HTML>' |