diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-25 00:08:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-25 00:08:50 +0300 |
| commit | 09b154dce0ccb441241f7923f4f30330e1611517 (patch) | |
| tree | e6014c2f94f63db266d11282c64428e39695d893 /qa/.confiner | |
| parent | 80c12cd5b2d42f4be0b1a9b550f0441157de7144 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'qa/.confiner')
| -rw-r--r-- | qa/.confiner/master.yml | 34 | ||||
| -rw-r--r-- | qa/.confiner/quarantine.yml | 15 |
2 files changed, 34 insertions, 15 deletions
diff --git a/qa/.confiner/master.yml b/qa/.confiner/master.yml new file mode 100644 index 00000000000..bfb44facd7d --- /dev/null +++ b/qa/.confiner/master.yml @@ -0,0 +1,34 @@ +- name: Quarantine E2E tests in Master that fail consistently + plugin: + name: gitlab # https://gitlab.com/gitlab-org/quality/confiner/-/blob/main/doc/plugins/gitlab.md + args: + threshold: 3 # 3 failures + private_token: $QA_GITLAB_CI_TOKEN + project_id: gitlab-org/gitlab-qa-mirror # https://gitlab.com/gitlab-org/gitlab-qa-mirror/ + target_project: gitlab-org/gitlab + failure_issue_labels: QA,Quality + failure_issue_prefix: "Failure in " + pwd: qa # E2E specs reside in the qa subdirectory + timeout: 30 + ref: master + actions: + - quarantine + +- name: Dequarantine E2E tests in Master that pass consistently + plugin: + name: gitlab # https://gitlab.com/gitlab-org/quality/confiner/-/blob/main/doc/plugins/gitlab.md + args: + threshold: 10 # at least 10 passes consecutively with no failures to be a candidate for dequarantine + private_token: $QA_GITLAB_CI_TOKEN + + # we do not run quarantined jobs automatically on master, but we still commit to master + project_id: gitlab-org/quality/nightly # https://gitlab.com/gitlab-org/quality/nightly/ + target_project: gitlab-org/gitlab # https://gitlab.com/gitlab-org/gitlab + failure_issue_labels: QA,Quality + failure_issue_prefix: "Failure in " + pwd: qa # E2E specs reside in the qa subdirectory + timeout: 30 + ref: master + job_pattern: '.+-quarantine' + actions: + - dequarantine diff --git a/qa/.confiner/quarantine.yml b/qa/.confiner/quarantine.yml deleted file mode 100644 index 6534d72525d..00000000000 --- a/qa/.confiner/quarantine.yml +++ /dev/null @@ -1,15 +0,0 @@ -- name: Quarantine E2E tests that fail consistently - plugin: - name: gitlab # https://gitlab.com/gitlab-org/quality/confiner/-/blob/main/doc/plugins/gitlab.md - args: - threshold: 3 # 3 failures - private_token: $QA_GITLAB_CI_TOKEN - project_id: gitlab-org/gitlab-qa-mirror # https://gitlab.com/gitlab-org/gitlab-qa-mirror/ - target_project: gitlab-org/gitlab - failure_issue_labels: QA,Quality - failure_issue_prefix: "Failure in " - pwd: qa # E2E specs reside in the qa subdirectory - timeout: 30 - ref: master - actions: - - quarantine |