summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml29
1 files changed, 27 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ad0f2abb..d1c2e472 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,7 +57,7 @@ tests:
script:
- tox -- --couch-url http://couchdb:5984
-benchmark:
+time-cpu:
stage: benchmark
image: 0xacab.org:4567/leap/soledad:latest
tags:
@@ -78,7 +78,32 @@ benchmark:
# Add $PYTEST_OPTS to pytest.ini to allow posting benchmark tests
# to an elasticsearch instance
- echo "addopts=$PYTEST_OPTS" >> pytest.ini && chmod 600 pytest.ini
- - /usr/bin/unbuffer tox --recreate -e benchmark -- --couch-url http://couchdb:5984 | /usr/bin/ts -s
+ - /usr/bin/unbuffer tox --recreate -e benchmark-time-cpu -- --couch-url http://couchdb:5984 | /usr/bin/ts -s
+ # Output locally saved benchmarks if they exist
+ - 'if [ -d .benchmarks ]; then find .benchmarks -type f -exec cat {} \; ; fi'
+
+memory:
+ stage: benchmark
+ image: 0xacab.org:4567/leap/soledad:latest
+ tags:
+ - benchmark
+ services:
+ - couchdb
+ script:
+ - git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA"
+ - '[ -n "${BENCHMARK_ALL_COMMITS}" ] && git checkout origin/master scripts/benchmark/setup-all-commits-env.sh'
+ - '[ -n "${BENCHMARK_ALL_COMMITS}" ] && ./scripts/benchmark/setup-all-commits-env.sh'
+ - curl -s couchdb:5984
+ # You can provide a $NETRC variable containing the creds for your
+ # elasticsearch instance so it's protected from being leaked in the
+ # CI console
+ # We can't get it working inside docker for unknown reasons.
+ # - echo "$NETRC" > /root/.netrc && chmod 600 /root/.netrc
+ #
+ # Add $PYTEST_OPTS to pytest.ini to allow posting benchmark tests
+ # to an elasticsearch instance
+ - echo "addopts=$PYTEST_OPTS" >> pytest.ini && chmod 600 pytest.ini
+ - /usr/bin/unbuffer tox --recreate -e benchmark-memory -- --couch-url http://couchdb:5984 | /usr/bin/ts -s
# Output locally saved benchmarks if they exist
- 'if [ -d .benchmarks ]; then find .benchmarks -type f -exec cat {} \; ; fi'