From 64926c61dc71eb63540c3acc9675b243715db668 Mon Sep 17 00:00:00 2001
From: Sylvain Briat <sylvain.briat@free.fr>
Date: Wed, 5 Apr 2023 10:09:36 +0000
Subject: [PATCH] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 131e38a..7aa37e5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,29 @@
 image: docker:20.10.22
 
 stages:
-
+  - test
   - build
 
+##############
+# TEST STAGE #
+##############
 
+test:
+  stage: test
+  image: docker/compose:latest
+  variables:
+    DOCKER_TLS_CERTDIR: ''
+  services:
+    - docker:dind
+  script:
+    - docker-compose -f docker-compose.ci.tools.yml -p auth-tools --env-file ci/.env.ci up -d
+    - sh ci/wait-up.sh
+    - docker-compose -f docker-compose.ci.service.yml -p auth-service --env-file ci/.env.ci up -d
+    - docker exec -t v3-auth-api sh -c "npm run test:integration:ci"
+  coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/
+  rules:
+    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH || $CI_COMMIT_MESSAGE =~ /--check/ || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
+      when: always
 
 ###############
 # BUILD STAGE #
@@ -21,7 +40,6 @@ build:
     - echo -n $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
   script:
     - export VERSION=$(docker run --rm -v "$PWD":/usr/src/app:ro -w /usr/src/app node:slim node -p "require('./package.json').version")
-    - echo $VERSION
     - docker pull $CI_REGISTRY_IMAGE:latest || true
     - >
       docker build 
@@ -30,7 +48,6 @@ build:
       --tag $CI_REGISTRY_IMAGE:$VERSION
       --tag $CI_REGISTRY_IMAGE:latest
       .
-    - docker image ls
     - docker push $CI_REGISTRY_IMAGE:$VERSION
     - docker push $CI_REGISTRY_IMAGE:latest
   only: