Commit 338ee3b6 authored by Siebers, Michael's avatar Siebers, Michael
Browse files

Merge branch 'test_branch_force_none' into '23-automate-api-tests'

Test MR pipeline

See merge request cogsys/dare2del/demonstrator!23
parents 6276b600 3171412e
......@@ -223,7 +223,7 @@ container:build:
variables:
CACHE_OPTION: --cache-from "${CI_REGISTRY_IMAGE}/${CONTAINER_DEPLOY_IMAGE}:latest"
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH
&& $FORCE_DOCKER_BUILD
&& $FORCE_DOCKER_BUILD == "yes"
variables:
CACHE_OPTION: --cache-from "${CI_REGISTRY_IMAGE}/${CONTAINER_DEPLOY_IMAGE}:latest" --cache-from "${CI_REGISTRY_IMAGE}/${CONTAINER_DEPLOY_IMAGE}:${CI_COMMIT_REF_SLUG}"
......@@ -247,7 +247,7 @@ container:validate:
- if: $CI_PIPELINE_SOURCE == "push"
&& $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH
&& $FORCE_DOCKER_BUILD
&& $FORCE_DOCKER_BUILD == "yes"
needs:
- job: "container:build"
artifacts: false
......@@ -276,7 +276,7 @@ container:deploy:
variables:
DEPLOY_TAG: latest
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH
&& $FORCE_DOCKER_BUILD
&& $FORCE_DOCKER_BUILD == "yes"
variables:
DEPLOY_TAG: $CI_COMMIT_REF_SLUG
......@@ -375,3 +375,20 @@ system_test:
when: always
reports:
junit: api-report.xml
# If no FORCE_... variable is set to "yes", no pipeline is created for merge
# requests targetting a non-default branch. Thus, the MR cannot be merged. This
# dummy job remedies the missing pipeline.
dummy for MR:
stage: deploy
script: ["true"]
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event"
&& $FORCE_UNIT_TESTS != "yes"
&& $FORCE_INTEGRATION_TESTS != "yes"
&& $FORCE_SYSTEM_TESTS != "yes"
&& $FORCE_DOCKER_BUILD != "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