diff --git a/.gitlab/merge_request_templates/Quarantine End to End Test.md b/.gitlab/merge_request_templates/Quarantine End to End Test.md index a23c143100191bf350b441f526187886b075b211..b015917f0d8c80451c9ae6ca7a4de14be4426121 100644 --- a/.gitlab/merge_request_templates/Quarantine End to End Test.md +++ b/.gitlab/merge_request_templates/Quarantine End to End Test.md @@ -19,12 +19,12 @@ the noise (due to constantly failing tests, flaky tests, and so on) so that new - [ ] [Code review guidelines](https://docs.gitlab.com/ee/development/code_review.html) - [ ] [Style guides](https://docs.gitlab.com/ee/development/contributing/style_guides.html) - [ ] Quarantine test check-list - - [ ] Follow the [Quarantining Tests guide](https://handbook.gitlab.com/handbook/engineering/infrastructure/test-platform/debugging-qa-test-failures/#quarantining-tests). - - [ ] Confirm the test has a [`quarantine:` tag with the specified quarantine type](https://handbook.gitlab.com/handbook/engineering/infrastructure/test-platform/debugging-qa-test-failures/#quarantined-test-types). + - [ ] Follow the [Quarantining Tests guide](https://handbook.gitlab.com/handbook/engineering/infrastructure/test-platform/pipeline-triage/#quarantining-tests). + - [ ] Confirm the test has a [`quarantine:` tag with the specified quarantine type](https://handbook.gitlab.com/handbook/engineering/infrastructure/test-platform/pipeline-triage/#quarantined-test-types). - [ ] Note if the test should be [quarantined for a specific environment](https://docs.gitlab.com/ee/development/testing_guide/end_to_end/execution_context_selection.html#quarantine-a-test-for-a-specific-environment). - [ ] (Optionally) In case of an emergency (e.g. blocked deployments), consider adding labels to pick into auto-deploy (~"Pick into auto-deploy" ~"priority::1" ~"severity::1"). - [ ] Dequarantine test check-list - - [ ] Follow the [Dequarantining Tests guide](https://handbook.gitlab.com/handbook/engineering/infrastructure/test-platform/debugging-qa-test-failures/#dequarantining-tests). + - [ ] Follow the [Dequarantining Tests guide](https://handbook.gitlab.com/handbook/engineering/infrastructure/test-platform/pipeline-triage/#dequarantining-tests). - [ ] Confirm the test consistently passes on the target GitLab environment(s). - [ ] To ensure a faster turnaround, ask in the `#quality_maintainers` Slack channel for someone to review and merge the merge request, rather than assigning it directly. diff --git a/qa/qa/specs/features/ee/browser_ui/3_create/repository/project_templates_spec.rb b/qa/qa/specs/features/ee/browser_ui/3_create/repository/project_templates_spec.rb index 85f6fbe13844141bc5b0c99e130fd92c47b75287..8f78e2af49edc523dc6d6ca84f8cf62dd84711c8 100644 --- a/qa/qa/specs/features/ee/browser_ui/3_create/repository/project_templates_spec.rb +++ b/qa/qa/specs/features/ee/browser_ui/3_create/repository/project_templates_spec.rb @@ -165,11 +165,7 @@ module QA end it 'successfully imports the project using template', - testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347933', quarantine: { - type: :bug, - issue: "https://gitlab.com/gitlab-org/gitlab/-/issues/436948", - only: { pipeline: %i[canary production] } - } do + testcase: 'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/347933' do Page::Project::New.perform do |new_page| expect(new_page.group_template_tab_badge_text).to eq "1" expect(new_page).to have_text(template_container_group_name)