Merge e7cb122 into 06c57be

obspy · Jul 30, 2016 · 7fba694 · 7fba694
2 parents 06c57be + e7cb122
commit 7fba694
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/misc/docker_tests/run_obspy_tests.sh b/misc/docker_tests/run_obspy_tests.sh
@@ -1,4 +1,9 @@
 #!/bin/bash
+
+# remove log directories older than 14 days (to avoid cluttering with GB of
+# data on buildbots that are run regularly)
+find logs/2[0-9][0-9][0-9]-[01][0-9]-[0-3][0-9]T[012][0-9]-[0-5][0-9]-[0-5][0-9]Z -type d -newermt `date --date='14 days ago' --rfc-3339=date` -exec rm -rf {} \;
+
 OBSPY_PATH=$(dirname $(dirname $(pwd)))
 
 # Remove all test images stored locally. Otherwise they'll end up on the

diff --git a/misc/docker_tests/scripts/install_and_run_tests_on_image.sh b/misc/docker_tests/scripts/install_and_run_tests_on_image.sh
@@ -16,7 +16,7 @@ fi
 
 cd
 
-obspy-runtests -r --keep-images --node=docker-$(cat /container_name.txt) > /TEST_LOG.txt 2>&1
+obspy-runtests -r --keep-images --no-flake8 --node=docker-$(cat /container_name.txt) > /TEST_LOG.txt 2>&1
 
 
 if [ $? != 0 ]; then