From c1b80ab1847ddbfe77360ed04b426029afdd8c85 Mon Sep 17 00:00:00 2001
From: Eliot Berriot <contact@eliotberriot.com>
Date: Mon, 26 Jun 2017 17:20:46 +0200
Subject: [PATCH] Removed dind requirement to run tests for the api part
---
.gitlab-ci.yml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a10a92e0..577d8b799 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
--
GitLab