Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '.gitlab/ci/package-and-test/rules.gitlab-ci.yml')
-rw-r--r--.gitlab/ci/package-and-test/rules.gitlab-ci.yml32
1 files changed, 30 insertions, 2 deletions
diff --git a/.gitlab/ci/package-and-test/rules.gitlab-ci.yml b/.gitlab/ci/package-and-test/rules.gitlab-ci.yml
index d866dec1cd0..47625340a3a 100644
--- a/.gitlab/ci/package-and-test/rules.gitlab-ci.yml
+++ b/.gitlab/ci/package-and-test/rules.gitlab-ci.yml
@@ -41,12 +41,27 @@
rules:
- when: always
+.rules:dont-interrupt:
+ rules:
+ - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+ allow_failure: true
+ - if: $CI_MERGE_REQUEST_IID
+ when: manual
+ allow_failure: true
+
+.rules:omnibus-build:
+ rules:
+ - if: $SKIP_OMNIBUS_TRIGGER == "true"
+ when: never
+ - when: always
+
# ------------------------------------------
# Test
# ------------------------------------------
-.rules:test:quarantine:
+.rules:test:manual:
rules:
- when: manual
+ allow_failure: true
variables:
QA_TESTS: ""
@@ -78,7 +93,10 @@
rules:
- *qa-framework-changes
- <<: *specific-specs
- when: never
+ when: manual
+ allow_failure: true
+ variables:
+ QA_TESTS: ""
- *feature-flags-set-manual
# general qa job rule for jobs without the need to run in parallel
@@ -87,11 +105,21 @@
- *qa-framework-changes
- *feature-flags-set-manual
+.rules:test:update:
+ rules:
+ # skip upgrade jobs if gitlab version is not provided
+ # these jobs need gitlab version because we can't reliably detect it from just the image
+ - if: $GITLAB_VERSION == null
+ when: never
+ - !reference [.rules:test:qa, rules]
+
# ------------------------------------------
# Report
# ------------------------------------------
.rules:report:allure-report:
rules:
+ - if: $SKIP_ALLURE_REPORT == "true"
+ when: never
- when: always
.rules:report:process-results: