.gitlab-ci.yml

@@ -8,12 +8,15 @@ include:
   - template: Code-Quality.gitlab-ci.yml
 
 sast:
-  stage: qa
+  stage: security
+  needs: []
   variables:
     SAST_EXCLUDED_PATHS: "*/static/"
 
 container_scanning:
-  stage: qa
+  stage: security
+  needs:
+    - build
   variables:
     DOCKER_SERVICE: localhost
 
@@ -23,9 +26,12 @@ code_quality:
 stages:
   - build
   - qa
+  - security
+  - doc
 
 build:
   stage: build
+  needs: []
   image:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
@@ -35,6 +41,8 @@ build:
 
 lint:
   stage: qa
+  needs:
+    - build
   image:
      name: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
      entrypoint: [""]
@@ -44,25 +52,25 @@ lint:
       junit: prospector-output.xml
   script:
     - prospector --profile ci | sed 's|<\(\/\?\)error\(.*\)>|<\1failure\2>|' >  prospector-output.xml
-
-lint-black:
+black:
   stage: qa
+  needs : []
   image:
-     name: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
+     name: registry.cri.epita.fr/cri/docker/black:3-slim
      entrypoint: [""]
   allow_failure: true
   artifacts:
+    when: on_failure
+    expose_as: "black diff"
     paths:
-      - artifacts/
-  before_script:
-    - mkdir artifacts
-    - chmod a+rwx artifacts
-    - pipenv install --deploy --pre --dev > /dev/null
+      - black.diff
   script:
-    - pipenv run black --check --diff $(find -name \*.py) > artifacts/black.diff
+    - /app/entrypoint.sh
 
 doc:
-  stage: qa
+  stage: doc
+  needs:
+    - build
   image:
      name: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
      entrypoint: [""]
@@ -82,6 +90,8 @@ doc:
 
 test:
   stage: qa
+  needs:
+    - build
   image:
      name: docker/compose:1.25.0-alpine
      entrypoint: [""]
@@ -113,7 +123,7 @@ test:
     - export COMPOSE_PARALLEL_LIMIT=1000
     - docker network prune
     - docker-compose -p "$CI_CONCURRENT_ID" up -d s3_dev ldap_dev ldap_sasl_dev db_dev
-    - sleep 10
+    - sleep 30
     - docker-compose -p "$CI_CONCURRENT_ID" up -d
     - docker-compose -p "$CI_CONCURRENT_ID" exec -T intranet_dev coverage run --source='.' ./manage.py test
     - docker-compose -p "$CI_CONCURRENT_ID" exec -T intranet_dev coverage report