diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-19 09:12:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-19 09:12:40 +0300 |
| commit | 4a69e105ab22c23edcdabb37fbdaf2554b088a6d (patch) | |
| tree | 1820b42aebaa75585fe38bd91302f59c8a6f7293 /.gitlab | |
| parent | 2ea638391497c495798e0bab7c704af112789299 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to '.gitlab')
| -rw-r--r-- | .gitlab/ci/qa.gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | .gitlab/ci/rules.gitlab-ci.yml | 13 |
2 files changed, 16 insertions, 1 deletions
diff --git a/.gitlab/ci/qa.gitlab-ci.yml b/.gitlab/ci/qa.gitlab-ci.yml index b786b2427ee..6f06746c49f 100644 --- a/.gitlab/ci/qa.gitlab-ci.yml +++ b/.gitlab/ci/qa.gitlab-ci.yml @@ -108,7 +108,9 @@ e2e:package-and-test-ce: PIPELINE_NAME: E2E Omnibus GitLab CE e2e:package-and-test-super-sidebar: - extends: e2e:package-and-test-ee + extends: + - e2e:package-and-test-ee + - .qa:rules:package-and-test-sidebar when: manual variables: QA_SUPER_SIDEBAR_ENABLED: "true" diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 2d23ce53c52..13189f88124 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -1406,6 +1406,19 @@ when: manual allow_failure: true +.qa:rules:package-and-test-sidebar: + rules: + - !reference [".qa:rules:package-and-test-mrs", rules] + - <<: *if-dot-com-gitlab-org-schedule + allow_failure: true + variables: + SKIP_REPORT_IN_ISSUES: "true" + PROCESS_TEST_RESULTS: "false" + KNAPSACK_GENERATE_REPORT: "false" + UPDATE_QA_CACHE: "false" + QA_SAVE_TEST_METRICS: "true" + QA_EXPORT_TEST_METRICS: "false" # on main runs, metrics are exported to separate bucket via rake task for better consistency + ############### # Rails rules # ############### |