diff options
Diffstat (limited to '.gitlab/ci/package-and-test/rules.gitlab-ci.yml')
| -rw-r--r-- | .gitlab/ci/package-and-test/rules.gitlab-ci.yml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/.gitlab/ci/package-and-test/rules.gitlab-ci.yml b/.gitlab/ci/package-and-test/rules.gitlab-ci.yml index 64d56cec21a..50b07589040 100644 --- a/.gitlab/ci/package-and-test/rules.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test/rules.gitlab-ci.yml @@ -43,9 +43,9 @@ .rules:dont-interrupt: rules: - - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH + - if: '$CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH && $CI_MERGE_REQUEST_IID == null' allow_failure: true - - if: $CI_MERGE_REQUEST_IID + - if: '$CI_MERGE_REQUEST_EVENT_TYPE == "merged_result" || $CI_MERGE_REQUEST_EVENT_TYPE == "detached"' when: manual allow_failure: true @@ -61,6 +61,15 @@ when: never - when: always +# This job requires project access token with api permissions to detect parallel jobs, +# it is problematic to set for every project that would include this template +# Because parallel jobs themselves can download knapsack report, skip for non canonical runs +.rules:download-knapsack: + rules: + - <<: *not-canonical-project + when: never + - when: always + # ------------------------------------------ # Test # ------------------------------------------ @@ -80,7 +89,7 @@ # parallel and non parallel rules are used for jobs that require parallel execution and thus need to switch # between parallel and non parallel when only certain specs are executed -.rules:test:qa-non-parallel: +.rules:test:qa-selective: rules: # always run parallel with full suite when framework changes present or ff state changed - <<: *qa-run-all-tests |