diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90bc11c..0eb0498 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,10 +16,9 @@ test: services: - docker:dind script: - - docker-compose -f docker-compose.ci-1.yml --env-file ci/.env.ci up -d + - docker-compose -f docker-compose.ci.tools.yml -p territory-tools --env-file ci/.env.ci up -d - sh ci/wait-up.sh - - docker-compose -f docker-compose.ci-1.yml --env-file ci/.env.ci logs - - docker-compose -f docker-compose.ci-2.yml --env-file ci/.env.ci up -d + - docker-compose -f docker-compose.ci.service.yml -p territory-service --env-file ci/.env.ci up -d - docker exec -t v3-territory sh -c "npm run test:integration:ci" coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/ rules: diff --git a/docker-compose.ci-2.yml b/docker-compose.ci.service.yml similarity index 100% rename from docker-compose.ci-2.yml rename to docker-compose.ci.service.yml diff --git a/docker-compose.ci-1.yml b/docker-compose.ci.tools.yml similarity index 100% rename from docker-compose.ci-1.yml rename to docker-compose.ci.tools.yml