ncaron
/
territory
mirror of https://gitlab.com/mobicoop/v3/service/territory.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'updateCi' into 'main' 

Update ci

See merge request v3/services/territory!2
This commit is contained in:
Sylvain Briat 2023-02-09 08:16:00 +00:00
parent 206a3292ed ee06ffc62f
commit e7f11ac32a
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@ -16,10 +16,9 @@ test:
services: services:
- docker:dind - docker:dind
script: 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 - 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.service.yml -p territory-service --env-file ci/.env.ci up -d
- docker-compose -f docker-compose.ci-2.yml --env-file ci/.env.ci up -d
- docker exec -t v3-territory sh -c "npm run test:integration:ci" - docker exec -t v3-territory sh -c "npm run test:integration:ci"
coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/ coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/
rules: rules:

0
docker-compose.ci-2.yml → docker-compose.ci.service.yml
View File

0
docker-compose.ci-1.yml → docker-compose.ci.tools.yml
View File