diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-18 03:07:23 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-18 03:07:23 +0000 |
| commit | 962afb3da11a72c7fca322378886b2c0be9f3385 (patch) | |
| tree | 541e08c4d329ab62cfbadde45b0f15d2171e004e /.gitlab | |
| parent | 8a560d56661f56804ddf6596f928e7d25db37443 (diff) | |
| download | gitlab-ce-master.tar.gz | |
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/package-and-test-nightly/main.gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/.gitlab/ci/package-and-test-nightly/main.gitlab-ci.yml b/.gitlab/ci/package-and-test-nightly/main.gitlab-ci.yml index 239044457e5..85de1a28b66 100644 --- a/.gitlab/ci/package-and-test-nightly/main.gitlab-ci.yml +++ b/.gitlab/ci/package-and-test-nightly/main.gitlab-ci.yml @@ -5,7 +5,7 @@ include: workflow: rules: - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "schedule" && $SCHEDULE_TYPE == "nightly"' + - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $SCHEDULE_TYPE == "nightly"' .ce: variables: 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" |