Diese Instanz von GitLab ist Pre-Release und noch nicht offiziell als Dienst freigeschaltet.

This GitLab instance is pre-release and not an officially announced service.

Skip to content
Snippets Groups Projects
Commit 135c15a8 authored by maxschmi's avatar maxschmi
Browse files

gitlab-ci: make build and test in same pipeline

parent 581c5a12
No related branches found
No related tags found
No related merge requests found
......@@ -26,9 +26,8 @@ stages:
build_test_image:
stage: build_test_image
rules:
- changes:
- Dockerfile.test
when: always
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
- if: $CI_COMMIT_BRANCH == "master"
script:
- unset DOCKER_HOST
- echo "$CI_REGISTRY_PASSWORD" | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
......@@ -42,9 +41,7 @@ build_test_image:
django-tests:
stage: test
image: $CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH
rules:
- if: $CI_PIPELINE_SOURCE == 'merge_request_event'
- if: $CI_COMMIT_BRANCH == "master"
rules: !reference [build_test_image, rules]
dependencies:
- build_test_image
services:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment