From 97ff8551cbdd49819177605db004840a9f5e08aa Mon Sep 17 00:00:00 2001 From: Marcel Feix Date: Fri, 1 Jul 2022 10:15:17 +0200 Subject: [PATCH] chore(CI):Execute docker Tests within Merge Request pipelines --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f4dbcfa..c7c9b40 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,6 +24,8 @@ Test-Docker-compose: rules: - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH when: always + - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH + when: always - when: manual trigger: strategy: depend @@ -35,6 +37,8 @@ Test-Dind: rules: - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH when: always + - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH + when: always - when: manual trigger: strategy: depend