diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cbb096e240b98b552c8d41da322fb89ac6ede17f..00b9d5f7ebc4d8d062294144d273671b927fde29 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,13 +11,13 @@ variables: k8sVersion: '1.20.5' stages: - - npm - build - test - deploy - release job_build-image: + stage: build tags: - docker-privileged @@ -26,20 +26,24 @@ job_build-image: - name: docker:20.10.12-dind before_script: - apk add --no-cache docker-compose + - yarn # - docker info # - docker-compose --version script: - docker-compose up -d --build - + cache: + paths: + - /app/server/node_modules/ + artifacts: + expire_in: 1 days + when: on_success + paths: + - app/server/node_modules/ after_script: - docker-compose down job_test-image: - - stage: test - tags: - - docker-privileged image: docker:20.10.12 services: - name: docker:20.10.12-dind @@ -49,18 +53,38 @@ job_test-image: outerPort: '38080' before_script: - apk add --no-cache docker-compose - # - yarn add --dev jest-junit - script: - - docker-compose -f docker-compose.test.yml up --build - - if [$(grep "exited with code 0")]; then exit 0; else exit 1; fi || true - # - grep 'exited with code 0' - # exit 0 - - after_script: - # NOTE: clean up after test run (stop and remove container) - # - docker rm --force "${CI_PROJECT_ID}-${CI_PIPELINE_IID}" - - docker-compose down + - 'jest --ci --reporters=default --reporters=jest-junit' + artifacts: + when: always + reports: + junit: + - junit.xml + + # stage: test + # tags: + # - docker-privileged + # image: docker:20.10.12 + # services: + # - name: docker:20.10.12-dind + # alias: containerhost + # variables: + # # NOTE: some random port that hopefully is free on the runner + # outerPort: '38080' + # before_script: + # - apk add --no-cache docker-compose + # # - yarn add --dev jest-junit + + # script: + # - docker-compose -f docker-compose.test.yml up --build + # - if [$(grep "exited with code 0")]; then exit 0; else exit 1; fi || true + # # - grep 'exited with code 0' + # # exit 0 + + # after_script: + # # NOTE: clean up after test run (stop and remove container) + # # - docker rm --force "${CI_PROJECT_ID}-${CI_PIPELINE_IID}" + # - docker-compose down job_deploy-new-version: diff --git a/app/server/jest.config.js b/app/server/jest.config.js index 606b5953207fe9e43d7af8c9aeddcd5d285c004a..5780873c2cadd7f4f8d6c2797c22a795a7329c66 100644 --- a/app/server/jest.config.js +++ b/app/server/jest.config.js @@ -1,3 +1,4 @@ module.exports = { - testEnvironment: 'node' + testEnvironment: 'node', + testResultsProcessor: 'jest-junit' };