--- a/.gitlab-ci.yml	Tue Jun 18 15:05:52 2019 +0200
+++ b/.gitlab-ci.yml	Tue Jun 18 15:34:02 2019 +0200
@@ -2,13 +2,15 @@
 
 stages:
     - build
-    - quality
+    - test
 
 before_script:
     - export http_proxy=http://172.17.0.1:3128/
+    - export HTTP_PROXY=http://172.17.0.1:3128/
     - export https_proxy=http://172.17.0.1:3128/
+    - export HTTPS_PROXY=http://172.17.0.1:3128/
 
-test:
+build:
     stage: build
     script:
         - python3.5 bootstrap.py --buildout-version=2.12.0
@@ -16,29 +18,13 @@
         - ./bin/test
 
 pylint:
-    stage: quality
+    stage: test
     allow_failure: true
     script:
         - pip install pylint --quiet
         - pylint src/
 
 codequality:
-    stage: quality
-    allow_failure: true
-    image: docker:latest
-    variables:
-        DOCKER_DRIVER: overlay2
-    services:
-        - docker:dind
-    script:
-        - cat /etc/hosts
-        - nslookup xgit98-000.dev-dsm.onf.fr
-        - docker pull codeclimate/codeclimate
-        - docker run
-            --env CODECLIMATE_CODE="$PWD"
-            --volume "$PWD":/code
-            --volume /var/run/docker.sock:/var/run/docker.sock
-            --volume /tmp/cc:/tmp/cc codeclimate/codeclimate analyze -f json > codeclimate.json
-    artifacts:
-        paths:
-            - codeclimate.json
+    stage: test
+    include:
+        - template: Code-Quality.gitlab-ci.yml