summaryrefslogtreecommitdiff
path: root/.gitlab/ci/rules.gitlab-ci.yml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-18 03:07:23 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-18 03:07:23 +0000
commit962afb3da11a72c7fca322378886b2c0be9f3385 (patch)
tree541e08c4d329ab62cfbadde45b0f15d2171e004e /.gitlab/ci/rules.gitlab-ci.yml
parent8a560d56661f56804ddf6596f928e7d25db37443 (diff)
downloadgitlab-ce-962afb3da11a72c7fca322378886b2c0be9f3385.tar.gz
Add latest changes from gitlab-org/gitlab@masterHEADmaster
Diffstat (limited to '.gitlab/ci/rules.gitlab-ci.yml')
-rw-r--r--.gitlab/ci/rules.gitlab-ci.yml9
1 files changed, 9 insertions, 0 deletions
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index e6ad520ccca..a5a1ff73c2b 100644
--- a/.gitlab/ci/rules.gitlab-ci.yml
+++ b/.gitlab/ci/rules.gitlab-ci.yml
@@ -1437,6 +1437,8 @@
.qa:rules:package-and-test-ee:
rules:
+ - <<: *if-default-branch-schedule-nightly # already executed in the 2-hourly schedule
+ when: never
- !reference [".qa:rules:package-and-test-common", rules]
- !reference [".qa:rules:package-and-test-schedule", rules]
@@ -1456,6 +1458,12 @@
changes: *code-qa-patterns
when: manual
allow_failure: true
+ - <<: *if-default-branch-schedule-nightly
+ allow_failure: true
+ variables:
+ SKIP_REPORT_IN_ISSUES: "false"
+ QA_SAVE_TEST_METRICS: "true"
+ QA_EXPORT_TEST_METRICS: "false"
.qa:rules:e2e:test-on-gdk:
rules:
@@ -1487,6 +1495,7 @@
.qa:rules:package-and-test-nightly:
rules:
- <<: *if-default-branch-schedule-nightly
+ allow_failure: true
variables:
KNAPSACK_GENERATE_REPORT: "true"
SKIP_REPORT_IN_ISSUES: "false"