From 28610dd8a0add7bdda7843e0f3b9766b024a9adf Mon Sep 17 00:00:00 2001 From: sbriat Date: Thu, 9 Feb 2023 09:05:38 +0100 Subject: [PATCH 1/2] test new ci --check --- .gitlab-ci.yml | 5 ++--- docker-compose.ci-2.yml => docker-compose.ci.service.yml | 0 docker-compose.ci-1.yml => docker-compose.ci.tools.yml | 0 3 files changed, 2 insertions(+), 3 deletions(-) rename docker-compose.ci-2.yml => docker-compose.ci.service.yml (100%) rename docker-compose.ci-1.yml => docker-compose.ci.tools.yml (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90bc11c..3008ea9 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 --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 --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 From ee06ffc62f98d4639d8dc6dc46abbbb99252d5ae Mon Sep 17 00:00:00 2001 From: sbriat Date: Thu, 9 Feb 2023 09:10:44 +0100 Subject: [PATCH 2/2] test new ci --check --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3008ea9..0eb0498 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,9 +16,9 @@ test: services: - docker:dind script: - - docker-compose -f docker-compose.ci.tools.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.service.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: