diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea0de97..4992e60 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,52 +7,7 @@ stages: include: - template: Security/SAST.gitlab-ci.yml - template: Security/Secret-Detection.gitlab-ci.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 configuration-tools --env-file ci/.env.ci up -d - - sh ci/wait-up.sh - - docker-compose -f docker-compose.ci.service.yml -p configuration-service --env-file ci/.env.ci up -d - # - docker exec -t v3-configuration-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' - when: always - -############### -# BUILD STAGE # -############### - -build: - stage: build - image: docker:20.10.22 - variables: - DOCKER_TLS_CERTDIR: '' - services: - - docker:dind - before_script: - - echo -n $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY - script: - - export VERSION=$(docker run --rm -v "$PWD":/usr/src/app:ro -w /usr/src/app node:slim node -p "require('./package.json').version") - - docker pull $CI_REGISTRY_IMAGE:latest || true - - > - docker build - --pull - --cache-from $CI_REGISTRY_IMAGE:latest - --tag $CI_REGISTRY_IMAGE:$VERSION - --tag $CI_REGISTRY_IMAGE:latest - . - - docker push $CI_REGISTRY_IMAGE:$VERSION - - docker push $CI_REGISTRY_IMAGE:latest - only: - - main + - project: mobicoop/v3/gitlab-templates + file: + - /ci/service.test-job.yml + - /ci/release.build-job.yml diff --git a/package.json b/package.json index cb3399e..dd91447 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ "test": "dotenv -e .env.test jest", "test:unit": "jest --testPathPattern 'tests/unit/' --verbose", "test:unit:ci": "jest --testPathPattern 'tests/unit/' --coverage", + "test:integration:ci": "", "test:cov": "jest --testPathPattern 'tests/unit/' --coverage", "test:e2e": "jest --config ./test/jest-e2e.json" },