Merge branch 'hotfix-pipeline-errors' into 'master'

Fix pipeline errors

See merge request cogsys/dare2del/demonstrator!28

.gitlab-ci.yml

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