test-bugzilla-files/commands.sh | 8 ++++++-- test-bugzilla-files/config | 2 ++ test-bugzilla-files/zip.sh | 4 +++- 3 files changed, 11 insertions(+), 3 deletions(-)
New commits: commit c61748d9adc90db8f7d5050eaa1d313e3a4e5dbf Author: Miklos Vajna <[email protected]> AuthorDate: Tue Aug 31 09:59:26 2021 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Tue Aug 31 09:59:34 2021 +0200 crashtest: allow not sending an email at the end / on failure This further shrinks the amount of typical local changes needed in a dev setup. Change-Id: I8f59b5036a09037d933d144f8a94b1f14d71280b diff --git a/test-bugzilla-files/commands.sh b/test-bugzilla-files/commands.sh index 78761d8..d1628f7 100755 --- a/test-bugzilla-files/commands.sh +++ b/test-bugzilla-files/commands.sh @@ -27,7 +27,9 @@ if [ -z "$CRASHTEST_READONLY_CORE" ]; then fi if [ "$?" != "0" ]; then - /srv/crashtestdata/sendEmail -t [email protected] -t [email protected] -u "Crash test build failure" -m "The build failed. Please check!" + if [ -z "$CRASHTEST_NO_EMAIL" ]; then + /srv/crashtestdata/sendEmail -t [email protected] -t [email protected] -u "Crash test build failure" -m "The build failed. Please check!" + fi exit 1 fi @@ -36,7 +38,9 @@ cd ~/source/dev-tools/test-bugzilla-files/ python3 new-control.py /srv/crashtestdata/files/ if [ "$?" != "0" ]; then - /srv/crashtestdata/sendEmail -t [email protected] -t [email protected] -u "Crash test failure" -m "The test run failed. Please check!" + if [ -z "$CRASHTEST_NO_EMAIL" ]; then + /srv/crashtestdata/sendEmail -t [email protected] -t [email protected] -u "Crash test failure" -m "The test run failed. Please check!" + fi exit 1 fi diff --git a/test-bugzilla-files/config b/test-bugzilla-files/config index 690bdd2..a7a30ea 100644 --- a/test-bugzilla-files/config +++ b/test-bugzilla-files/config @@ -8,6 +8,8 @@ export USERDIR=/home/$USER/.config # export CRASHTEST_READONLY_CORE=1 # Don't touch the dev-tools.git source/build directory: # export CRASHTEST_READONLY_DEVTOOLS=1 +# Don't send email at the end/on failure: +# export CRASHTEST_NO_EMAIL=1 dir=$HOME/source/dev-tools/test-bugzilla-files if [ -e ${dir}/config.local ]; then diff --git a/test-bugzilla-files/zip.sh b/test-bugzilla-files/zip.sh index aaa4426..db0e78a 100755 --- a/test-bugzilla-files/zip.sh +++ b/test-bugzilla-files/zip.sh @@ -24,4 +24,6 @@ zip -r current.zip $SHA/* scp current.zip [email protected]:/srv/www/dev-builds.libreoffice.org/crashtest/. ssh [email protected] unzip -n /srv/www/dev-builds.libreoffice.org/crashtest/current.zip -d /srv/www/dev-builds.libreoffice.org/crashtest cd /srv/crashtestdata/ -/srv/crashtestdata/sendEmail -t [email protected] -u "Crash test update" -m "New crashtest update available at https://dev-builds.libreoffice.org/crashtest/$SHA/"; -a logs/*.csv +if [ -z "$CRASHTEST_NO_EMAIL" ]; then + /srv/crashtestdata/sendEmail -t [email protected] -u "Crash test update" -m "New crashtest update available at https://dev-builds.libreoffice.org/crashtest/$SHA/"; -a logs/*.csv +fi
