[benchmarks] Improve benchmark-all-commits.sh script

1 files changed, 16 insertions, 6 deletions

diff --git a/benchmark-all-commits.sh b/benchmark-all-commits.sh
index f4367991..418ed905 100755
--- a/benchmark-all-commits.sh
+++ b/benchmark-all-commits.sh
@@ -1,24 +1,34 @@
-#!/bin/sh -x
+#!/bin/bash -x
 #
 # Go backwards in git history and run benchmark tests
 # Export PYTEST_OPTS so pytest will post metrics to an elasticsearch
 # instance, i.e.
 #
 #     export PYTEST_OPTS='--benchmark-autosave --benchmark-storage="elasticsearch+https://USER:PASSWORD@moose.leap.se:9200"'
-
+# or, for testing a single test group:
+#     export PYTEST_OPTS='--benchmark-autosave --benchmark-storage="elasticsearch+https://USER:PASSWORD@moose.leap.se:9200" -m benchmark_test_instance'
+#
 # Todo
 #
 #   - Error handling. This script is dump and will run forever.
 
-rm -rf testing/.tox
+#rm -rf testing/.tox
 
 while /bin/true
 do
-  git checkout HEAD testing/tox.ini testing/tests/benchmarks/conftest.py testing/tests/conftest.py
+  echo -e '\n\n\n\n\n'
+
+  git checkout origin/master testing/tox.ini testing/tests/benchmarks/conftest.py testing/tests/conftest.py
+
+  curl -s localhost:5984 || exit 1
+
+  # Make sure we kill all leftover soledad server/pytest procs
+  pkill -f -9 tox
+  tox -c testing/tox.ini -e benchmark -- -x "$PYTEST_OPTS"
+  #gitlab-runner exec docker benchmark --env PYTEST_OPTS="$PYTEST_OPTS"
 
-  tox -c testing/tox.ini -e benchmark -- -x $PYTEST_OPTS
 
   git reset HEAD testing/tox.ini
-  git checkout testing/tox.ini
+  git checkout testing/tox.ini testing/tests/benchmarks/conftest.py testing/tests/conftest.py
   git checkout HEAD^
 done