From 5696ac57bd847a446625ff38db2119955b4db99c Mon Sep 17 00:00:00 2001 From: Romain Thouvenin Date: Tue, 2 Apr 2024 12:01:38 +0200 Subject: [PATCH] Generic test job that also runs on release merge requests --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7179d91..01fea53 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,11 +22,11 @@ test: services: - docker:dind script: - - docker-compose -f docker-compose.ci.tools.yml -p matcher-tools --env-file ci/.env.ci up -d + - 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 matcher-service --env-file ci/.env.ci up -d - - docker exec -t v3-matcher-api sh -c "npm run test:integration:ci" + - 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_COMMIT_MESSAGE =~ /--check/ || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + - 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