Merge branch 'feature/remove-dind' into 'develop'

Removed dind requirement to run tests for the api part

See merge request !3
merge-requests/154/head
Eliot Berriot 2017-06-26 15:27:46 +00:00
commit 37ebde38ee
1 zmienionych plików z 7 dodań i 6 usunięć

Wyświetl plik

@ -4,15 +4,16 @@ stages:
test_api:
stage: test
image: funkwhale/funkwhale:base
before_script:
- docker-compose -f api/test.yml build
- cd api
- pip install -r requirements/test.txt
script:
- docker-compose -f api/test.yml run test
after_script:
- docker-compose -f api/test.yml run test rm -rf funkwhale_api/media/
- export DJANGO_SETTINGS_MODULE=config.settings.test
- python manage.py test
tags:
- dind
- docker
build_front:
stage: build
@ -53,6 +54,6 @@ pages:
paths:
- public
only:
- master
- develop
tags:
- docker