diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aff33252ae055e573eeeabf34e0f5bf19b197206..a24ad498df768d29bb8a9a0e3017ba9e4f47adf7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,20 +31,38 @@ stages: - test - deploy -# run unit tests of the server +# Setup: Build a docker image in which tests for this repository can run +build-testenv: + tags: [ cached-dind ] + image: docker:19.03 + stage: setup + only: + - schedules + script: + - cd src/test/docker + - docker login -u indiscale -p $CI_REGISTRY_PASSWORD $CI_REGISTRY + # use here general latest or specific branch latest... + - docker pull $CI_REGISTRY_IMAGE || true + - docker build + --pull + --cache-from $CI_REGISTRY_IMAGE + -t $CI_REGISTRY_IMAGE . + - docker push $CI_REGISTRY_IMAGE + +# Test: run unit tests of the server test: tags: [ docker ] stage: test script: - make test_misc - make easy-units - - mvn dependency:purge-local-repository + # - mvn dependency:purge-local-repository - mvn antlr4:antlr4 - mvn compile - echo "defaultRealm = CaosDB" > conf/ext/usersources.ini - mvn test -# Trigger building of server image and integration tests +# Deploy: Trigger building of server image and integration tests trigger_build: tags: [ docker ] stage: deploy @@ -55,21 +73,3 @@ trigger_build: -F "variables[TriggerdBy]=SERVER" -F "variables[TriggerdByHash]=$CI_COMMIT_SHORT_SHA" -F ref=dev https://gitlab.indiscale.com/api/v4/projects/14/trigger/pipeline - -# Build a docker image in which tests for this repository can run -build-testenv: - tags: [ cached-dind ] - image: docker:19.03 - stage: setup - only: - - schedules - script: - - cd src/test/docker - - docker login -u indiscale -p $CI_REGISTRY_PASSWORD $CI_REGISTRY - # use here general latest or specific branch latest... - - docker pull $CI_REGISTRY_IMAGE || true - - docker build - --pull - --cache-from $CI_REGISTRY_IMAGE - -t $CI_REGISTRY_IMAGE . - - docker push $CI_REGISTRY_IMAGE