From a43ef7fbd1ad5de3b779b0edc09d26528c77445f Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Thu, 13 Feb 2020 10:27:49 +0000 Subject: [PATCH 1/2] Add whitelist maintenance information to buildkite annotation --- scripts/dendrite_sytest.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/dendrite_sytest.sh b/scripts/dendrite_sytest.sh index e9ab4f46b..c31175825 100755 --- a/scripts/dendrite_sytest.sh +++ b/scripts/dendrite_sytest.sh @@ -52,7 +52,7 @@ fi # Check for new tests to be added to the test whitelist /src/show-expected-fail-tests.sh /logs/results.tap /src/sytest-whitelist \ - /src/sytest-blacklist || TEST_STATUS=$? + /src/sytest-blacklist > /src/test-whitelist.log || TEST_STATUS=$? echo >&2 "--- Copying assets" @@ -62,6 +62,9 @@ rsync -r --ignore-missing-args --min-size=1B -av /work/server-0 /work/server-1 / if [ $TEST_STATUS -ne 0 ]; then # Build the annotation perl /sytest/scripts/format_tap.pl /logs/results.tap "$BUILDKITE_LABEL" >/logs/annotate.md + # If show-expected-fail-tests logged something, put it in the annotation + # We want nice output though, so surround the text output in code tags + cat /src/test-whitelist.log >> /logs/annotate.md fi exit $TEST_STATUS From 2130d188842ec5f256f85f6c1c76a9f37478c967 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Mon, 27 Apr 2020 15:15:11 +0100 Subject: [PATCH 2/2] Remove code tag comment, fix script output location --- scripts/dendrite_sytest.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/dendrite_sytest.sh b/scripts/dendrite_sytest.sh index c31175825..aecd09a8b 100755 --- a/scripts/dendrite_sytest.sh +++ b/scripts/dendrite_sytest.sh @@ -52,7 +52,7 @@ fi # Check for new tests to be added to the test whitelist /src/show-expected-fail-tests.sh /logs/results.tap /src/sytest-whitelist \ - /src/sytest-blacklist > /src/test-whitelist.log || TEST_STATUS=$? + /src/sytest-blacklist > /work/show_expected_fail_tests_output.txt || TEST_STATUS=$? echo >&2 "--- Copying assets" @@ -62,9 +62,10 @@ rsync -r --ignore-missing-args --min-size=1B -av /work/server-0 /work/server-1 / if [ $TEST_STATUS -ne 0 ]; then # Build the annotation perl /sytest/scripts/format_tap.pl /logs/results.tap "$BUILDKITE_LABEL" >/logs/annotate.md - # If show-expected-fail-tests logged something, put it in the annotation - # We want nice output though, so surround the text output in code tags - cat /src/test-whitelist.log >> /logs/annotate.md + # If show-expected-fail-tests logged something, put it into the annotation + # Annotations from a failed build show at the top of buildkite, alerting + # developers quickly as to what needs to change in the black/whitelist. + cat /work/show_expected_fail_tests_output.txt >> /logs/annotate.md fi exit $TEST_STATUS