Commit 9435a0de authored by niklas.baumgarten's avatar niklas.baumgarten
Browse files

Merge branch 'pipeline-patch' into 'feature'

Pipeline patch

See merge request mpp/mpp!464
parents 194c3c14 8a47d55b
......@@ -10,7 +10,6 @@ include:
variables:
extends: .global-variables
RUN_PROJECTS: 'all'
UPSTREAM_COMMIT: ${CI_COMMIT_SHA}
UPSTREAM_PIPELINE_ID: ${CI_PIPELINE_ID}
......
......@@ -3,6 +3,8 @@
OS_VERSION: '20.04'
BENCHMARK: 'none'
DOCKER_TLS_CERTDIR: '/certs'
RUN_PROJECTS: 'all'
services:
- docker:dind
......@@ -13,7 +15,7 @@ services:
image: docker:latest
only:
variables:
- $BENCHMARK == 'none'
- ($BENCHMARK == 'none') && ($RUN_PROJECTS == 'all')
variables:
GIT_SUBMODULE_STRATEGY: recursive
PROJECT_NAME: 'THIS_VARIABLE_HAS_TO_BE_SET'
......@@ -43,7 +45,7 @@ services:
stage: test
only:
variables:
- $BENCHMARK == 'none'
- ($BENCHMARK == 'none') && ($RUN_PROJECTS == 'all')
variables:
GIT_STRATEGY: none
PROJECT_NAME: 'THIS_VARIABLE_HAS_TO_BE_SET'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment