diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 01fea53..d61a66e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,25 +8,6 @@ include: - template: Security/SAST.gitlab-ci.yml - template: Security/Secret-Detection.gitlab-ci.yml - project: mobicoop/v3/gitlab-templates - file: /ci/release.build-job.yml - -############## -# 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 $CI_PROJECT_NAME-tools --env-file ci/.env.ci up -d - - sh ci/wait-up.sh - - docker-compose -f docker-compose.ci.service.yml -p $CI_PROJECT_NAME-service --env-file ci/.env.ci up -d - - docker exec -t v3-$CI_PROJECT_NAME-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_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /^release/ || $CI_COMMIT_MESSAGE =~ /--check/ || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' - when: always + file: + - /ci/release.build-job.yml + - /ci/service.test-job.yml