diff options
| author | drebs <drebs@riseup.net> | 2017-09-17 12:08:25 -0300 |
|---|---|---|
| committer | drebs <drebs@riseup.net> | 2017-09-17 15:50:55 -0300 |
| commit | cfff46ff9becdbe5cf48816870e625ed253ecc57 (patch) | |
| tree | 8d239e4499f559d86ed17ea3632008303b25d485 /.gitlab-ci.yml | |
| parent | f29abe28bd778838626d12fcabe3980a8ce4fa8c (diff) | |
[refactor] move tests to root of repository
Tests entrypoint was in a testing/ subfolder in the root of the
repository. This was made mainly because we had some common files for
tests and we didn't want to ship them (files in testing/test_soledad,
which is itself a python package. This sometimes causes errors when
loading tests (it seems setuptools is confused with having one python
package in a subdirectory of another).
This commit moves the tests entrypoint to the root of the repository.
Closes: #8952
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d284d65d..ad0f2abb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ cache: untracked: true key: soledad-shared-pip-cache paths: - - testing/.cache/ + - .cache/ before_script: - echo "Running on ${HOST_HOSTNAME:=$(hostname)}" @@ -47,7 +47,6 @@ code-check: stage: code-check image: 0xacab.org:4567/leap/soledad:latest script: - - cd testing - tox -e code-check tests: @@ -56,7 +55,6 @@ tests: services: - couchdb script: - - cd testing - tox -- --couch-url http://couchdb:5984 benchmark: @@ -70,7 +68,6 @@ benchmark: - 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' - - cd testing - 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 @@ -94,7 +91,6 @@ responsiveness: - couchdb script: - git checkout -B "$CI_COMMIT_REF_NAME" "$CI_COMMIT_SHA" - - cd testing - curl -s couchdb:5984 - echo "addopts=--elasticsearch-url=\"$ELASTICSEARCH_URL\"" >> pytest.ini && chmod 600 pytest.ini - /usr/bin/unbuffer tox --recreate -e responsiveness -- --couch-url http://couchdb:5984 | /usr/bin/ts -s |