diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/hooks/post_test_hook.sh | 10 | ||||
| -rwxr-xr-x | tools/releasenotes_tox.sh | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tools/hooks/post_test_hook.sh b/tools/hooks/post_test_hook.sh index 72237a1e26..5f72eb378d 100755 --- a/tools/hooks/post_test_hook.sh +++ b/tools/hooks/post_test_hook.sh @@ -6,9 +6,13 @@ function archive_deleted_rows { # NOTE(danms): Run this a few times to make sure that we end # up with nothing more to archive for i in `seq 30`; do - out=$($MANAGE db archive_deleted_rows --verbose --max_rows 1000) - echo $? - if [[ $out =~ "Nothing was archived" ]]; then + $MANAGE db archive_deleted_rows --verbose --max_rows 1000 + RET=$? + if [[ $RET -gt 1 ]]; then + echo Archiving failed with result $RET + return $RET + elif [[ $RET -eq 0 ]]; then + echo Archiving Complete break; fi done diff --git a/tools/releasenotes_tox.sh b/tools/releasenotes_tox.sh index 4fecfd9299..fc64b9950b 100755 --- a/tools/releasenotes_tox.sh +++ b/tools/releasenotes_tox.sh @@ -9,7 +9,7 @@ sphinx-build -a -E -W \ BUILD_RESULT=$? UNCOMMITTED_NOTES=$(git status --porcelain | \ - awk '$1 == "M" && $2 ~ /releasenotes\/notes/ {print $2}') + awk '$1 ~ "M|A|??" && $2 ~ /releasenotes\/notes/ {print $2}') if [ "${UNCOMMITTED_NOTES}" ] then |