From 0cbc0348fb5dcfb9203963f8108042753b3912bb Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <benjamin.bertrand@esss.se>
Date: Thu, 8 Feb 2018 09:23:19 +0100
Subject: [PATCH] Refactor gitlab-ci

- Use gitlab-ci services instead of docker-compose to run postgres and
  redis
- Switch to docker socket
---
 .gitlab-ci.yml | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d36c4bf..38e6576 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,15 +2,15 @@ image: docker:latest
 
 .runner_tags: &runner_tags
   tags:
-    - dind
-
-services:
-  - docker:dind
+    - docker
 
 variables:
   CONTAINER_TEST_IMAGE: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
   CONTAINER_RELEASE_IMAGE: "$CI_REGISTRY_IMAGE:latest"
   CONTAINER_CACHE_IMAGE: "$CI_REGISTRY_IMAGE:master"
+  POSTGRES_USER: ics
+  POSTGRES_PASSWORD: icspwd
+  POSTGRES_DB: csentry_db_test
 
 stages:
   - build
@@ -32,18 +32,13 @@ build:
 test:
   <<: *runner_tags
   stage: test
-  before_script:
-    - apk add --update py-pip
-    - pip install docker-compose
-    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  image: "$CONTAINER_TEST_IMAGE"
+  services:
+    - postgres:10
+    - redis:4.0
+  before_script: []
   script:
-    - docker pull "$CONTAINER_TEST_IMAGE"
-    - docker-compose -f docker-compose.yml up -d postgres redis
-    - sleep 5
-    - docker-compose -f docker-compose.yml run --rm web
-  after_script:
-    - docker rm -f csentry_postgres
-    - docker rm -f csentry_redis
+    - pytest --cov=app -v
 
 release-image:
   <<: *runner_tags
-- 
GitLab