Commit d3efb13c authored by Siebers, Michael's avatar Siebers, Michael
Browse files

fix pipeline errors

parent 23d5f28e
...@@ -219,7 +219,7 @@ container:build: ...@@ -219,7 +219,7 @@ container:build:
variables: variables:
CACHE_OPTION: --no-cache CACHE_OPTION: --no-cache
- if: $CI_PIPELINE_SOURCE == "push" - if: $CI_PIPELINE_SOURCE == "push"
&& $CI_COMMIT_BRANCH == "$CI_DEFAULT_BRANCH" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
variables: variables:
CACHE_OPTION: --cache-from "${CI_REGISTRY_IMAGE}/${CONTAINER_DEPLOY_IMAGE}:latest" CACHE_OPTION: --cache-from "${CI_REGISTRY_IMAGE}/${CONTAINER_DEPLOY_IMAGE}:latest"
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH
...@@ -310,7 +310,7 @@ documentation:build: ...@@ -310,7 +310,7 @@ documentation:build:
- utils/generate_documentation.sh "$BUILD_DIR" "webapi" - utils/generate_documentation.sh "$BUILD_DIR" "webapi"
rules: rules:
- if: $CI_PIPELINE_SOURCE == "push" - if: $CI_PIPELINE_SOURCE == "push"
&& $CI_COMMIT_BRANCH == "$CI_DEFAULT_BRANCH" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
variables: variables:
NAME: latest NAME: latest
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
...@@ -342,7 +342,7 @@ system_test:prepare_container: ...@@ -342,7 +342,7 @@ system_test:prepare_container:
variables: variables:
CACHE_OPTION: --no-cache CACHE_OPTION: --no-cache
- if: $CI_PIPELINE_SOURCE == "push" - if: $CI_PIPELINE_SOURCE == "push"
&& $CI_COMMIT_BRANCH == "$CI_DEFAULT_BRANCH" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_PIPELINE_SOURCE == "push" - if: $CI_PIPELINE_SOURCE == "push"
&& ($CI_OPEN_MERGE_REQUESTS == null || $CI_OPEN_MERGE_REQUESTS == "") && ($CI_OPEN_MERGE_REQUESTS == null || $CI_OPEN_MERGE_REQUESTS == "")
&& $FORCE_SYSTEM_TESTS == "yes" && $FORCE_SYSTEM_TESTS == "yes"
...@@ -365,7 +365,7 @@ system_test:prepare_container: ...@@ -365,7 +365,7 @@ system_test:prepare_container:
&& $FORCE_SYSTEM_TESTS == "yes" && $FORCE_SYSTEM_TESTS == "yes"
- if: $CI_COMMIT_TAG - if: $CI_COMMIT_TAG
- if: $CI_PIPELINE_SOURCE == "push" - if: $CI_PIPELINE_SOURCE == "push"
&& $CI_COMMIT_BRANCH == "$CI_DEFAULT_BRANCH" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_PIPELINE_SOURCE == "push" - if: $CI_PIPELINE_SOURCE == "push"
&& ($CI_OPEN_MERGE_REQUESTS == null || $CI_OPEN_MERGE_REQUESTS == "") && ($CI_OPEN_MERGE_REQUESTS == null || $CI_OPEN_MERGE_REQUESTS == "")
&& $FORCE_SYSTEM_TESTS == "yes" && $FORCE_SYSTEM_TESTS == "yes"
......
Supports Markdown
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