From bcd4332b6b1163c4033f62fa2c72a349ef2e04a1 Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Sun, 14 May 2017 15:21:48 +0200 Subject: jenkins-run: clean up also upon error Change-Id: I949849d85d93cb47c839cd738788cf6f9b22fc12 --- contrib/jenkins-run.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contrib/jenkins-run.sh b/contrib/jenkins-run.sh index 87d29bf..3931ddb 100755 --- a/contrib/jenkins-run.sh +++ b/contrib/jenkins-run.sh @@ -16,10 +16,16 @@ rm *.md5 # OSMO_GSM_TESTER_OPTS is a way to pass in e.g. logging preferences from the # jenkins build job. -python3 -u "$(which osmo-gsm-tester.py)" "$trial_dir" $OSMO_GSM_TESTER_OPTS +# On failure, first clean up below and then return the exit code. +exit_code="1" +if python3 -u "$(which osmo-gsm-tester.py)" "$trial_dir" $OSMO_GSM_TESTER_OPTS ; then + exit_code="0" +fi # no need to keep extracted binaries rm -rf "$trial_dir/inst" || true # tar up all results for archiving (optional) tar czf "$trial_dir"-run.tgz "$trial_dir" + +exit $exit_code -- cgit v1.2.3